Magellan Linux

Diff of /trunk/initscripts-alx/patches/initscripts-0.3.4-r10-alx.patch

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

revision 753 by niro, Wed Mar 4 16:56:04 2009 UTC revision 754 by niro, Wed Mar 4 17:29:49 2009 UTC
# Line 65  diff -Naur builded2/etc/init.d/mountfs b Line 65  diff -Naur builded2/etc/init.d/mountfs b
65   update_svcstatus $1   update_svcstatus $1
66   splash svc_started "$(basename $0)" 0   splash svc_started "$(basename $0)" 0
67   ;;   ;;
 diff -Naur builded2/etc/rc.d/init.d/modules builded/etc/rc.d/init.d/modules  
 --- builded2/etc/rc.d/init.d/modules 2009-03-04 18:19:48.000000000 +0100  
 +++ builded/etc/rc.d/init.d/modules 2009-03-04 18:23:59.000000000 +0100  
 @@ -20,9 +20,14 @@  
  # a livecd has always the file .bootdev at root  
  if [ ! -e /.bootdev ]  
  then  
 - echo -e ${COLOREDSTAR}"Calculating modules dependencies ..."  
 - modules-update  
 - evaluate_retval  
 + if [ /etc/modules.d -nt /etc/modules.conf ]  
 + then  
 + echo -e ${COLOREDSTAR}"Calculating modules dependencies ..."  
 + modules-update  
 + evaluate_retval  
 + else  
 + echo -e ${COLOREDSTAR}"Modules dependencies are up-to-date ..."  
 + fi  
  fi  
   
  # get modules.autoload file matching to kernel  
 diff -Naur builded2/etc/rc.d/init.d/mountfs builded/etc/rc.d/init.d/mountfs  
 --- builded2/etc/rc.d/init.d/mountfs 2009-03-04 18:19:48.000000000 +0100  
 +++ builded/etc/rc.d/init.d/mountfs 2009-03-04 18:25:14.000000000 +0100  
 @@ -13,6 +13,19 @@  
  source /etc/sysconfig/rc  
  source $rc_functions  
   
 +populate_alx_log()  
 +{  
 + echo -e ${COLOREDSTAR}"Populating /var/log with fake file system ..."  
 +  
 + [ ! -d /var/log ] && install -d /var/log  
 + rm -rf /var/log/*  
 +  
 + mount -t tmpfs tmpfs /var/log || return 1  
 + install -d /var/log/samba || return 1  
 + install -d /var/log/cups || return 1  
 + install -d /var/log/news || return 1  
 +}  
 +  
  case "$1" in  
  start)  
  echo -e ${COLOREDSTAR}"Remounting root file system in read-write mode ..."  
 @@ -60,6 +73,9 @@  
  mount -a -t $NO_FS  
  evaluate_retval  
   
 + populate_alx_log  
 + evaluate_retval  
 +  
  update_svcstatus $1  
  splash svc_started "$(basename $0)" 0  
  ;;  

Legend:
Removed from v.753  
changed lines
  Added in v.754