Magellan Linux

Diff of /trunk/initscripts/busybox/rc/rc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

trunk/busybox-initscripts/rc/rc revision 1197 by niro, Thu Jan 27 20:42:51 2011 UTC trunk/initscripts/busybox/rc/rc revision 1890 by niro, Wed Aug 22 17:55:09 2012 UTC
# Line 8  source ${rc_functions} Line 8  source ${rc_functions}
8  [ -f /etc/conf.d/kernel ] && source /etc/conf.d/kernel  [ -f /etc/conf.d/kernel ] && source /etc/conf.d/kernel
9    
10  # get mage version  # get mage version
11  MAGEVER="$(< /etc/mageversion)"  if [[ -f /etc/os-release ]]
12    then
13     MAGEVER="$(read_os_release version_id)"
14    elif [ -f /etc/mageversion ]
15    then
16     MAGEVER="$(< /etc/mageversion)"
17    else
18     MAGEVER="unkown"
19    fi
20    
21  # source kernel config if exists  # source kernel config if exists
22  [ -f /etc/conf.d/kernel ] && source /etc/conf.d/kernel  [ -f /etc/conf.d/kernel ] && source /etc/conf.d/kernel
# Line 26  fi Line 34  fi
34  trap "" INT QUIT TSTP  trap "" INT QUIT TSTP
35    
36  [ "$1" != "" ] && runlevel=$1  [ "$1" != "" ] && runlevel=$1
37    # export runlevel variable to make it accessible for other rc-scripts
38    export runlevel
39    
40  if [[ $runlevel = sysinit ]]  if [[ $runlevel = sysinit ]]
41  then  then
42   rc_echo   rc_echo
43   rc_echo -e "${COLGREEN}Starting ${COLBLUE}MAGELLAN (v${MAGEVER}) ${COLGREEN}Linux${COLDEFAULT}"   rc_echo -e "${COLGREEN}Starting ${COLBLUE}MAGELLAN (v${MAGEVER}) ${COLGREEN}Linux${COLDEFAULT}"
44   rc_echo "Copyright 2001-2011 Niels Rogalla; http://magellan-linux.net"   rc_echo "Copyright 2001-2012 Niels Rogalla; http://magellan-linux.net"
45   rc_echo   rc_echo
46    
47   # mount proc filesystem, needed for bootsplash;   # mount proc filesystem, needed for bootsplash;
# Line 53  then Line 63  then
63   # mount sys file system before udev   # mount sys file system before udev
64   if [ -d /sys ]   if [ -d /sys ]
65   then   then
66   rc_print "Mounting sysfs file system ..."   if [ ! -e /sys/kernel/notes ]
67   mount -n -t sysfs sysfs /sys   then
68   evaluate_retval   rc_print "Mounting sysfs file system ..."
69     mount -n -t sysfs sysfs /sys
70     evaluate_retval
71     fi
72   else   else
73   rc_echo -e ${COLORED}"Fatal: mountpoint /sys missing ..."   rc_echo -e ${COLRED}"Fatal: mountpoint /sys missing ..."
74   rc_echo -e ${COLYELLOW}"Please create the directory /sys (mkdir -p /sys)."   rc_echo -e ${COLYELLOW}"Please create the directory /sys (mkdir -p /sys)."
75   rc_echo -e ${COLYELLOW}"It's essential for a 2.6 kernel."   rc_echo -e ${COLYELLOW}"It's essential for a 2.6 kernel."
76   fi   fi
# Line 114  then Line 127  then
127   rc_print "Mounting tmpfs at ${svcdir} ..."   rc_print "Mounting tmpfs at ${svcdir} ..."
128   mount -n -t tmpfs tmpfs "${svcdir}" -o rw,mode=0644,size="${svcsize}"k   mount -n -t tmpfs tmpfs "${svcdir}" -o rw,mode=0644,size="${svcsize}"k
129   evaluate_retval   evaluate_retval
130    
131     ## /run /tmp /var/lock
132     for i in /run /tmp /var/lock
133     do
134     if [ -d ${i} ]
135     then
136     rc_print "Mounting tmpfs at ${i} ..."
137     mount -n -t tmpfs tmpfs ${i} -o rw,nosuid,nodev,relatime
138     evaluate_retval
139     fi
140     done
141     # extra check for /var/lock
142     if [ -L /var/lock ]
143     then
144     mkdir -p /run/lock
145     rc_print "Mounting tmpfs at /run/lock ..."
146     mount -n -t tmpfs tmpfs /run/lock -o rw,nosuid,nodev,relatime
147     evaluate_retval
148     fi
149     # extra check if /run and /var/run are directories
150     if [ -d /run ] && [ -d /var/run ]
151     then
152     rc_print "Mounting tmpfs at /var/run ..."
153     mount -n -o bind /run /var/run
154     evaluate_retval
155     fi
156  fi  fi
157    
158  if [[ ${runlevel} = shutdown ]] || [[ ${runlevel} = reboot ]]  if [[ ${runlevel} = shutdown ]] || [[ ${runlevel} = reboot ]]
# Line 123  then Line 162  then
162    
163   # if requested save devices to a device tarball before halt   # if requested save devices to a device tarball before halt
164   # only for kernels >=2.6 *and* udev   # only for kernels >=2.6 *and* udev
165   # make shure that udev is mounted but *not* devfs --> /dev/.devfsd   # make sure that udev is mounted but *not* devfs --> /dev/.devfsd
166   if [[ ${RC_DEVICE_TARBALL} = yes ]] && \   if [[ ${RC_DEVICE_TARBALL} = yes ]] && \
167   [ -e /dev/.udev -a ! -e /dev/.devfsd -a ! -e /.bootdev ]   [ -e /dev/.udev -a ! -e /dev/.devfsd -a ! -e /.bootdev ]
168   then   then
# Line 169  then Line 208  then
208   done   done
209  fi  fi
210    
211  if [[ ${runlevel} = boot ]]  if [[ ${runlevel} = boot ]] || [[ ${runlevel} = shutdown ]] || [[ ${runlevel} = reboot ]]
212  then  then
213   # exit bootsplash   # exit bootsplash
214   splash "rc_exit" "${runlevel}"   splash "rc_exit" "${runlevel}"

Legend:
Removed from v.1197  
changed lines
  Added in v.1890