added hint regarding customization to /etc/runlevel.conf.livecd and fixed place of...

diff --git a/debian/changelog b/debian/changelog
index 5ea2a65..8c627bc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+grml-etc (0.9-6) unstable; urgency=low
+
+  * Add hint regarding customization to /etc/runlevel.conf.livecd*
+  * Adjust place of networking script (I hate package updates without
+    the relevant notes in the changelog) - networking should not live
+    at '35' only but at '40' as well, otherwise we have problems with
+    resolvconf at '38'. To fix the issue on your box without using
+    /etc/runlevel.conf.* of this package invoke:
+
+      update-rc.d -f networking remove
+      update-rc.d networking start 40 S . start 35 0 6 .
+
+ -- Michael Prokop <mika@grml.org>  Mon,  8 Jan 2007 16:36:49 +0100
+
 grml-etc (0.9-5) unstable; urgency=low
 
   * Replace all xterm commands in configuration files with

diff --git a/etc/runlevel.conf.hdinstall b/etc/runlevel.conf.hdinstall
index 00daff4..cd76197 100644 (file)
--- a/etc/runlevel.conf.hdinstall
+++ b/etc/runlevel.conf.hdinstall
@@ -200,7 +200,7 @@
 31     -       0,6             /etc/init.d/umountnfs.sh
 31     -       -               /etc/init.d/hibernate
 32     -       0,6             /etc/init.d/portmap
-35     -       S               /etc/init.d/networking
+35     -       0,6             /etc/init.d/networking
 35     0,6     -               /etc/init.d/tspc
 35     -       S               /etc/init.d/mountall.sh
 36     -       0,6             /etc/init.d/firehol
@@ -221,6 +221,7 @@
 40     0,1,6   -               /etc/init.d/arpwatch
 40     0,1,6   -               /etc/init.d/dhcp3-server
 40     -       S               /etc/init.d/ifrename
+40     -       S               /etc/init.d/networking
 40     -       -               /etc/init.d/nufw
 40     -       -               /etc/init.d/pcmciautils
 40     -       -               /etc/init.d/uruk

diff --git a/etc/runlevel.conf.hdinstall.small b/etc/runlevel.conf.hdinstall.small
index d9ab6ed..7e043a3 100644 (file)
--- a/etc/runlevel.conf.hdinstall.small
+++ b/etc/runlevel.conf.hdinstall.small
@@ -36,13 +36,14 @@
 30     -       S               /etc/init.d/checkfs.sh
 30     -       1               /etc/init.d/killprocs
 31     -       0,6             /etc/init.d/umountnfs.sh
-35     -       S               /etc/init.d/networking
 35     -       S               /etc/init.d/mountall.sh
+35     -       0,6             /etc/init.d/networking
 36     -       S               /etc/init.d/ifupdown
 36     -       S               /etc/init.d/udev-mtab
 36     -       S               /etc/init.d/mountall-bootclean.sh
 36     -       S               /etc/init.d/mtab.sh
 37     -       0,6             /etc/init.d/sendsigs
+40     -       S               /etc/init.d/networking
 40     -       0,6             /etc/init.d/umountfs
 40     -       S               /etc/init.d/hostname.sh
 45     -       S               /etc/init.d/mountnfs.sh

diff --git a/etc/runlevel.conf.livecd b/etc/runlevel.conf.livecd
index 5adcd29..7689658 100644 (file)
--- a/etc/runlevel.conf.livecd
+++ b/etc/runlevel.conf.livecd
@@ -2,6 +2,16 @@
 # You can use your favourite editor or update-rc.d(8) to modify it.
 # Read runlevel.conf(5) man page for more information about this file.
 #
+############################################################################
+# *IMPORTANT* This is the file used in the live-cd mode of grml.
+# Please notice that customization of this file will not work with the
+# save-config mechanism, as init takes place (and reads the file
+# /etc/runlevel.conf) before restore-config can be executed at all.
+# If you want to customize the grml boot sequence please either
+# remaster the grml-ISO or (much simplier) just add your personal
+# stuff to the /etc/init.d/bootlocal.* scripts!
+############################################################################
+#
 # Format:
 # <sort> <off-> <on-levels>     <command>
 01     -       2               /etc/init.d/bootsplash_start.sh
@@ -140,7 +150,6 @@
 31     -       0,6             /etc/init.d/umountnfs.sh
 31     -       -               /etc/init.d/hibernate
 32     -       0,6             /etc/init.d/portmap
-35     -       -               /etc/init.d/networking
 35     0,6     -               /etc/init.d/tspc
 35     -       -               /etc/init.d/mountall.sh
 36     -       0,6             /etc/init.d/firehol
@@ -151,6 +160,7 @@
 37     -       0,6             /etc/init.d/sendsigs
 37     0,6     -               /etc/init.d/setkey
 38     -       S               /etc/init.d/resolvconf
+40     -       -               /etc/init.d/networking
 40     -       0,6             /etc/init.d/umountfs
 40     0,1,6   -               /etc/init.d/arpwatch
 40     0,1,6   -               /etc/init.d/dhcp3-server

diff --git a/etc/runlevel.conf.livecd.small b/etc/runlevel.conf.livecd.small
index 78f0d24..bbdfaf7 100644 (file)
--- a/etc/runlevel.conf.livecd.small
+++ b/etc/runlevel.conf.livecd.small
@@ -2,6 +2,16 @@
 # You can use your favourite editor or update-rc.d(8) to modify it.
 # Read runlevel.conf(5) man page for more information about this file.
 #
+############################################################################
+# *IMPORTANT* This is the file used in the live-cd mode of grml-small.
+# Please notice that customization of this file will not work with the
+# save-config mechanism, as init takes place (and reads the file
+# /etc/runlevel.conf) before restore-config can be executed at all.
+# If you want to customize the grml boot sequence please either
+# remaster the grml-ISO or (much simplier) just add your personal
+# stuff to the /etc/init.d/bootlocal.* scripts!
+############################################################################
+#
 # Format:
 # <sort> <off-> <on-levels>     <command>
 01     -       2               /etc/init.d/bootsplash_start.sh
@@ -30,11 +40,11 @@
 30     -       2,3,4,5         /etc/init.d/grml-autoconfig
 30     0,6     -               /etc/init.d/etc-setserial
 31     -       0,6             /etc/init.d/umountnfs.sh
-35     -       -               /etc/init.d/networking
 36     -       S               /etc/init.d/ifupdown
 36     -       -               /etc/init.d/mountvirtfs
 36     -       S               /etc/init.d/udev-mtab
 37     -       0,6             /etc/init.d/sendsigs
+40     -       -               /etc/init.d/networking
 40     -       0,6             /etc/init.d/umountfs
 50     -       0,6             /etc/init.d/lvm
 50     -       0,6             /etc/init.d/mdadm-raid