The filesystems are now mounted in the same way the sysmobts2100 build does it. This fixes the failing checkflash systemd service on the oc2g. Related: SYS#4493for/201705
parent
584c1ccf10
commit
50579753a0
@ -1,6 +1,4 @@
|
||||
THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
|
||||
FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
|
||||
|
||||
PRINC="4"
|
||||
|
||||
dirs755_append_oc2g = "/mnt/rom /mnt/rom/factory"
|
||||
PRINC="5"
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
/dev/root / auto defaults 1 1
|
||||
proc /proc proc defaults 0 0
|
||||
devpts /dev/pts devpts mode=0620,gid=5 0 0
|
||||
tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0
|
||||
tmpfs /var/volatile tmpfs defaults 0 0
|
||||
|
||||
/dev/mtdblock8 /mnt/rom/factory jffs2 ro,sync,noatime,nofail 0 0
|
||||
#/dev/mmcblk0p4 /mnt/storage ext4 defaults,noatime,nofail 0 0
|
||||
|
||||
@ -0,0 +1,8 @@
|
||||
[Unit]
|
||||
Description=Automount ROM partition with factory defaults
|
||||
|
||||
[Automount]
|
||||
Where=/mnt/rom/factory
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@ -0,0 +1,11 @@
|
||||
[Unit]
|
||||
Description=Mount ROM partition with factory defaults
|
||||
|
||||
[Mount]
|
||||
What=/dev/mtdblock8
|
||||
Where=/mnt/rom/factory
|
||||
Type=jffs2
|
||||
Options=ro
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@ -0,0 +1,8 @@
|
||||
[Unit]
|
||||
Description=Automount user partition with default settings
|
||||
|
||||
[Automount]
|
||||
Where=/mnt/rom/user
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@ -0,0 +1,10 @@
|
||||
[Unit]
|
||||
Description=Mount user partition with default settings
|
||||
|
||||
[Mount]
|
||||
What=/dev/mtdblock9
|
||||
Where=/mnt/rom/user
|
||||
Type=jffs2
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@ -0,0 +1,8 @@
|
||||
[Unit]
|
||||
Description=Automount storage partition
|
||||
|
||||
[Automount]
|
||||
Where=/mnt/storage
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@ -0,0 +1,10 @@
|
||||
[Unit]
|
||||
Description=Mount storage partition
|
||||
|
||||
[Mount]
|
||||
What=/dev/mmcblk0p4
|
||||
Where=/mnt/storage
|
||||
Type=ext4
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@ -1,52 +0,0 @@
|
||||
#!/bin/sh
|
||||
# Start/stop the system devices remapping for OC-2G daemon.
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: oc2g-sysdev-remap
|
||||
# Required-Start: $syslog $time
|
||||
# Required-Stop: $syslog $time
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Remapping all availble system devices of OC-2G platform in system to a easy to reach location
|
||||
# Description: Accessible to all system devices related to OC-2G platform will be available at /var/oc2g
|
||||
#
|
||||
### END INIT INFO
|
||||
|
||||
REMAP_DIR='/var/volatile/oc2g'
|
||||
|
||||
test -f /usr/bin/oc2g-sysdev-remap|| exit 0
|
||||
|
||||
. /etc/init.d/functions
|
||||
|
||||
log_daemon_msg () {
|
||||
echo $@
|
||||
}
|
||||
|
||||
log_end_msg () {
|
||||
if test "$1" != "0"; then
|
||||
echo "Error with $DESCRIPTION: $NAME"
|
||||
fi
|
||||
return $1
|
||||
}
|
||||
|
||||
|
||||
case "$1" in
|
||||
start) log_daemon_msg "Starting system devices remapping script:" "oc2g-sysdev-remap"
|
||||
mkdir -p ${REMAP_DIR}
|
||||
/usr/bin/oc2g-sysdev-remap
|
||||
log_end_msg $?
|
||||
;;
|
||||
stop) log_daemon_msg "Stopping system devices remapping script:" "oc2g-sysdev-remap"
|
||||
test -d ${REMAP_DIR} && rm -rf ${REMAP_DIR}
|
||||
;;
|
||||
restart) log_daemon_msg "Restarting system devices remapping script:" "oc2oc2gg-sysdev-remap"
|
||||
test -d ${REMAP_DIR} && rm -rf ${REMAP_DIR}
|
||||
mkdir -p ${REMAP_DIR}
|
||||
/usr/bin/oc2g-sysdev-remap
|
||||
log_end_msg $?
|
||||
;;
|
||||
*) log_action_msg "Usage: /etc/init.d/oc2g-sysdev-remap {start|stop|restart}"
|
||||
exit 2
|
||||
;;
|
||||
esac
|
||||
exit 0
|
||||
@ -1,21 +1,18 @@
|
||||
[Unit]
|
||||
SourcePath=/etc/init.d/oc2g-sysdev-remap
|
||||
Description=Remapping all available system devices of platform to a easy to reach location
|
||||
Before=multi-user.target
|
||||
Before=shutdown.target
|
||||
Before=watchdog.service
|
||||
After=local-fs.target
|
||||
Before=osmo-bts-oc2g.service
|
||||
After=checkflash.service
|
||||
Wants=checkflash.service
|
||||
After=time-sync.target
|
||||
Conflicts=shutdown.target
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
Restart=no
|
||||
TimeoutSec=5min
|
||||
IgnoreSIGPIPE=no
|
||||
KillMode=process
|
||||
GuessMainPID=no
|
||||
Type=oneshot
|
||||
RuntimeDirectory=oc2g
|
||||
ExecStart=/bin/ln -f -s /run/oc2g /var/oc2g
|
||||
ExecStart=/usr/bin/oc2g-sysdev-remap
|
||||
RemainAfterExit=yes
|
||||
ExecStart=/etc/init.d/oc2g-sysdev-remap start
|
||||
ExecStop=/etc/init.d/oc2g-sysdev-remap stop
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target oc2gbts-mgr.service
|
||||
|
||||
Loading…
Reference in new issue