Annotation of /trunk/initscripts-alx/patches/initscripts-0.3.4-r10-alx.patch
Parent Directory
| 
Revision Log
Revision 753 -
(hide annotations)
(download)
Wed Mar 4 16:56:04 2009 UTC (15 years, 3 months ago) by niro
File size: 3613 byte(s)
Wed Mar 4 16:56:04 2009 UTC (15 years, 3 months ago) by niro
File size: 3613 byte(s)
alx patches
| 1 | niro | 753 | diff -Naur builded2/etc/conf.d/kernel builded/etc/conf.d/kernel |
| 2 | --- builded2/etc/conf.d/kernel 2009-03-04 18:19:48.000000000 +0100 | ||
| 3 | +++ builded/etc/conf.d/kernel 2009-03-04 18:23:00.000000000 +0100 | ||
| 4 | @@ -17,7 +17,7 @@ | ||
| 5 | |||
| 6 | |||
| 7 | # Sets the default verbose level for kernel messages. | ||
| 8 | -# The default Magellan-Linux value: | ||
| 9 | -RC_VERBOSE_LEVEL=3 | ||
| 10 | +# The default ALX-Linux value: | ||
| 11 | +RC_VERBOSE_LEVEL=0 | ||
| 12 | # This value is very noisy and tells nearly everything: | ||
| 13 | #RC_VERBOSE_LEVEL=7 | ||
| 14 | diff -Naur builded2/etc/init.d/modules builded/etc/init.d/modules | ||
| 15 | --- builded2/etc/init.d/modules 2009-03-04 18:19:48.000000000 +0100 | ||
| 16 | +++ builded/etc/init.d/modules 2009-03-04 18:23:59.000000000 +0100 | ||
| 17 | @@ -20,9 +20,14 @@ | ||
| 18 | # a livecd has always the file .bootdev at root | ||
| 19 | if [ ! -e /.bootdev ] | ||
| 20 | then | ||
| 21 | - echo -e ${COLOREDSTAR}"Calculating modules dependencies ..." | ||
| 22 | - modules-update | ||
| 23 | - evaluate_retval | ||
| 24 | + if [ /etc/modules.d -nt /etc/modules.conf ] | ||
| 25 | + then | ||
| 26 | + echo -e ${COLOREDSTAR}"Calculating modules dependencies ..." | ||
| 27 | + modules-update | ||
| 28 | + evaluate_retval | ||
| 29 | + else | ||
| 30 | + echo -e ${COLOREDSTAR}"Modules dependencies are up-to-date ..." | ||
| 31 | + fi | ||
| 32 | fi | ||
| 33 | |||
| 34 | # get modules.autoload file matching to kernel | ||
| 35 | diff -Naur builded2/etc/init.d/mountfs builded/etc/init.d/mountfs | ||
| 36 | --- builded2/etc/init.d/mountfs 2009-03-04 18:19:48.000000000 +0100 | ||
| 37 | +++ builded/etc/init.d/mountfs 2009-03-04 18:25:14.000000000 +0100 | ||
| 38 | @@ -13,6 +13,19 @@ | ||
| 39 | source /etc/sysconfig/rc | ||
| 40 | source $rc_functions | ||
| 41 | |||
| 42 | +populate_alx_log() | ||
| 43 | +{ | ||
| 44 | + echo -e ${COLOREDSTAR}"Populating /var/log with fake file system ..." | ||
| 45 | + | ||
| 46 | + [ ! -d /var/log ] && install -d /var/log | ||
| 47 | + rm -rf /var/log/* | ||
| 48 | + | ||
| 49 | + mount -t tmpfs tmpfs /var/log || return 1 | ||
| 50 | + install -d /var/log/samba || return 1 | ||
| 51 | + install -d /var/log/cups || return 1 | ||
| 52 | + install -d /var/log/news || return 1 | ||
| 53 | +} | ||
| 54 | + | ||
| 55 | case "$1" in | ||
| 56 | start) | ||
| 57 | echo -e ${COLOREDSTAR}"Remounting root file system in read-write mode ..." | ||
| 58 | @@ -60,6 +73,9 @@ | ||
| 59 | mount -a -t $NO_FS | ||
| 60 | evaluate_retval | ||
| 61 | |||
| 62 | + populate_alx_log | ||
| 63 | + evaluate_retval | ||
| 64 | + | ||
| 65 | update_svcstatus $1 | ||
| 66 | splash svc_started "$(basename $0)" 0 | ||
| 67 | ;; | ||
| 68 | diff -Naur builded2/etc/rc.d/init.d/modules builded/etc/rc.d/init.d/modules | ||
| 69 | --- builded2/etc/rc.d/init.d/modules 2009-03-04 18:19:48.000000000 +0100 | ||
| 70 | +++ builded/etc/rc.d/init.d/modules 2009-03-04 18:23:59.000000000 +0100 | ||
| 71 | @@ -20,9 +20,14 @@ | ||
| 72 | # a livecd has always the file .bootdev at root | ||
| 73 | if [ ! -e /.bootdev ] | ||
| 74 | then | ||
| 75 | - echo -e ${COLOREDSTAR}"Calculating modules dependencies ..." | ||
| 76 | - modules-update | ||
| 77 | - evaluate_retval | ||
| 78 | + if [ /etc/modules.d -nt /etc/modules.conf ] | ||
| 79 | + then | ||
| 80 | + echo -e ${COLOREDSTAR}"Calculating modules dependencies ..." | ||
| 81 | + modules-update | ||
| 82 | + evaluate_retval | ||
| 83 | + else | ||
| 84 | + echo -e ${COLOREDSTAR}"Modules dependencies are up-to-date ..." | ||
| 85 | + fi | ||
| 86 | fi | ||
| 87 | |||
| 88 | # get modules.autoload file matching to kernel | ||
| 89 | diff -Naur builded2/etc/rc.d/init.d/mountfs builded/etc/rc.d/init.d/mountfs | ||
| 90 | --- builded2/etc/rc.d/init.d/mountfs 2009-03-04 18:19:48.000000000 +0100 | ||
| 91 | +++ builded/etc/rc.d/init.d/mountfs 2009-03-04 18:25:14.000000000 +0100 | ||
| 92 | @@ -13,6 +13,19 @@ | ||
| 93 | source /etc/sysconfig/rc | ||
| 94 | source $rc_functions | ||
| 95 | |||
| 96 | +populate_alx_log() | ||
| 97 | +{ | ||
| 98 | + echo -e ${COLOREDSTAR}"Populating /var/log with fake file system ..." | ||
| 99 | + | ||
| 100 | + [ ! -d /var/log ] && install -d /var/log | ||
| 101 | + rm -rf /var/log/* | ||
| 102 | + | ||
| 103 | + mount -t tmpfs tmpfs /var/log || return 1 | ||
| 104 | + install -d /var/log/samba || return 1 | ||
| 105 | + install -d /var/log/cups || return 1 | ||
| 106 | + install -d /var/log/news || return 1 | ||
| 107 | +} | ||
| 108 | + | ||
| 109 | case "$1" in | ||
| 110 | start) | ||
| 111 | echo -e ${COLOREDSTAR}"Remounting root file system in read-write mode ..." | ||
| 112 | @@ -60,6 +73,9 @@ | ||
| 113 | mount -a -t $NO_FS | ||
| 114 | evaluate_retval | ||
| 115 | |||
| 116 | + populate_alx_log | ||
| 117 | + evaluate_retval | ||
| 118 | + | ||
| 119 | update_svcstatus $1 | ||
| 120 | splash svc_started "$(basename $0)" 0 | ||
| 121 | ;; |