Skip to content

W
White Rabbit Switch - Software
Commit 6cc476a0 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

userspace/rootfs_override: move init scripts to rcS 

Move:
/etc/init.d/[SK]??<name> to /etc/init.d/<name>
Then create symlinks in
/etc/init.d/rcS/[SK]??* to all files that previously were /etc/init.d/[SK]??*
With exception of monit since monit will start soon from init.

Rename all occurences of changed files.
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent f8eba9b4
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 12 deletions
doc/wrs-user-manual.in
View file @ 6cc476a0
...@@ -915,7 +915,7 @@ The following tools and scripts are provided: ...@@ -915,7 +915,7 @@ The following tools and scripts are provided:
pass the TAI offset to the kernel, and to consider it in setting pass the TAI offset to the kernel, and to consider it in setting
White Rabbit time to the current TAI value. The program is White Rabbit time to the current TAI value. The program is
meant to prime the White Rabbit counter at boot time, and is meant to prime the White Rabbit counter at boot time, and is
run by @t{/etc/init.d/S70wr_date} -- this script uses NTP run by @t{/etc/init.d/wr_date} -- this script uses NTP
to set host time as a first step, if @t{/wr/etc/wr_date.conf} to set host time as a first step, if @t{/wr/etc/wr_date.conf}
exists and includes a line of the form @t{ntpserver 192.168.16.1}. exists and includes a line of the form @t{ntpserver 192.168.16.1}.
......
userspace/rootfs_override/etc/init.d/rcK
View file @ 6cc476a0
...@@ -8,7 +8,7 @@ fi ...@@ -8,7 +8,7 @@ fi
# executing them in numerical order. # executing them in numerical order.
# #
for i in /etc/init.d/K??* ;do for i in /etc/rcS/K??* ;do
# Ignore dangling symlinks (if any). # Ignore dangling symlinks (if any).
[ ! -f "$i" ] && continue [ ! -f "$i" ] && continue
......
userspace/rootfs_override/etc/init.d/rcS
View file @ 6cc476a0
...@@ -8,7 +8,7 @@ fi ...@@ -8,7 +8,7 @@ fi
# executing them in numerical order. # executing them in numerical order.
# #
for i in /etc/init.d/S??* ;do for i in /etc/rcS/S??* ;do
# Ignore dangling symlinks (if any). # Ignore dangling symlinks (if any).
[ ! -f "$i" ] && continue [ ! -f "$i" ] && continue
......
userspace/rootfs_override/etc/init.d/wrs-boot-procedure
View file @ 6cc476a0
#!/bin/sh #!/bin/sh
# This is executed as "sysinit" level, before all /etc/init.d/rcS* scripts. # This is executed as "sysinit" level, before all /etc/init.d/rcS/S* scripts.
# Warning: this file (and only this one) is executed in initramfs # Warning: this file (and only this one) is executed in initramfs
# *before* /etc is copied from flash, so you can't edit this on # *before* /etc is copied from flash, so you can't edit this on
...@@ -143,7 +143,7 @@ if [ -f /update/$WRS_FW -o -f /update/$WRS_USR ]; then ...@@ -143,7 +143,7 @@ if [ -f /update/$WRS_FW -o -f /update/$WRS_USR ]; then
fi fi
# a special fix: we may need to create hwinfo when upgrading from 4.0 # a special fix: we may need to create hwinfo when upgrading from 4.0
if [ -x /wr/bin/sdb-read ]; then if [ -x /wr/bin/sdb-read ]; then
/etc/init.d/S90hwinfo /etc/init.d/hwinfo
fi fi
sync; cd /; umount /usr sync; cd /; umount /usr
......
userspace/rootfs_override/etc/inittab
View file @ 6cc476a0
...@@ -29,7 +29,7 @@ ttyGS0::respawn:/bin/ash --login ...@@ -29,7 +29,7 @@ ttyGS0::respawn:/bin/ash --login
ttyS0::respawn:/bin/ash --login ttyS0::respawn:/bin/ash --login
# Stuff to do before rebooting # Stuff to do before rebooting
# run all /etc/init.d/K* scripts # run all /etc/rcS/K??* scripts
null::shutdown:/etc/init.d/rcK -a -r null::shutdown:/etc/init.d/rcK -a -r
null::shutdown:/bin/umount -a -r null::shutdown:/bin/umount -a -r
userspace/rootfs_override/etc/monit.d/snmp.conf
View file @ 6cc476a0
check process snmpd with pidfile /var/run/snmpd.pid check process snmpd with pidfile /var/run/snmpd.pid
start program = "/etc/init.d/S80snmp start" start program = "/etc/init.d/snmp start"
stop program = "/etc/init.d/S80snmp stop" stop program = "/etc/init.d/snmp stop"
# if failed host localhost port 161 type udp then restart # if failed host localhost port 161 type udp then restart
# if 5 restarts within 10 then exec "/sbin/reboot" # if 5 restarts within 10 then exec "/sbin/reboot"
userspace/rootfs_override/etc/rcS/K90time_save.sh 0 → 120000
View file @ 6cc476a0
../init.d/time_save.sh
\ No newline at end of file
userspace/rootfs_override/etc/rcS/S20dot-config 0 → 120000
View file @ 6cc476a0
../init.d/dot-config
\ No newline at end of file
userspace/rootfs_override/etc/rcS/S30dev_shmem 0 → 120000
View file @ 6cc476a0
../init.d/dev_shmem
\ No newline at end of file
userspace/rootfs_override/etc/rcS/S40network 0 → 120000
View file @ 6cc476a0
../init.d/network
\ No newline at end of file
userspace/rootfs_override/etc/rcS/S50dropbear 0 → 120000
View file @ 6cc476a0
../init.d/dropbear
\ No newline at end of file
userspace/rootfs_override/etc/rcS/S50syslogd 0 → 120000
View file @ 6cc476a0
../init.d/syslogd
\ No newline at end of file
userspace/rootfs_override/etc/rcS/S60wr 0 → 120000
View file @ 6cc476a0
../init.d/wr
\ No newline at end of file
userspace/rootfs_override/etc/rcS/S70wr_date 0 → 120000
View file @ 6cc476a0
../init.d/wr_date
\ No newline at end of file
userspace/rootfs_override/etc/rcS/S70wrs_auxclk 0 → 120000
View file @ 6cc476a0
../init.d/wrs_auxclk
\ No newline at end of file
userspace/rootfs_override/etc/rcS/S80snmp 0 → 120000
View file @ 6cc476a0
../init.d/snmp
\ No newline at end of file
userspace/rootfs_override/etc/rcS/S90hwinfo 0 → 120000
View file @ 6cc476a0
../init.d/hwinfo
\ No newline at end of file
userspace/rootfs_override/etc/rcS/S90lighttpd.sh 0 → 120000
View file @ 6cc476a0
../init.d/lighttpd.sh
\ No newline at end of file
userspace/rootfs_override/var/www/functions.php
View file @ 6cc476a0
...@@ -743,7 +743,7 @@ function wrs_management(){ ...@@ -743,7 +743,7 @@ function wrs_management(){
}else{ //Not running }else{ //Not running
shell_exec("/etc/init.d/S80snmp > /dev/null 2>&1 &"); shell_exec("/etc/init.d/snmp start> /dev/null 2>&1 &");
} }
......
userspace/rootfs_override/wr/bin/apply_dot-config
View file @ 6cc476a0
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# the choices users wanted. You can change the dot-config on flash, # the choices users wanted. You can change the dot-config on flash,
# and call this script to apply changes (please note that some changes # and call this script to apply changes (please note that some changes
# require restarting running processes). The script is called at # require restarting running processes). The script is called at
# every boot by /etc/init.d/S20dot-config # every boot by /etc/init.d/dot-config
# When called with "local_config" parameter, files with information about # When called with "local_config" parameter, files with information about
# dotconfig source are removed (used by SNMP) # dotconfig source are removed (used by SNMP)
......
userspace/snmpd/wrsBootStatusGroup.c
View file @ 6cc476a0
...@@ -236,7 +236,7 @@ static void get_dotconfig_source(void) ...@@ -236,7 +236,7 @@ static void get_dotconfig_source(void)
} }
/* get status of execution of following scripts: /* get status of execution of following scripts:
* /etc/init.d/S90hwinfo * /etc/init.d/hwinfo
* /wr/sbin/startup-mb.sh (load FPGA and LM32) * /wr/sbin/startup-mb.sh (load FPGA and LM32)
* */ * */
static void get_boot_scripts_status(void){ static void get_boot_scripts_status(void){
...@@ -250,7 +250,7 @@ static void get_boot_scripts_status(void){ ...@@ -250,7 +250,7 @@ static void get_boot_scripts_status(void){
} }
run_once = 1; run_once = 1;
/* read result of S90hwinfo (HWinfo) execution */ /* read result of /etc/init.d/hwinfo (HWinfo) execution */
f = fopen(HWINFO_FILE, "r"); f = fopen(HWINFO_FILE, "r");
if (f) { if (f) {
/* readline without newline */ /* readline without newline */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment