projects
/
grml-etc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7bb0abf
)
Add support for bootlocal.{first,middle,last}
author
Frank Terbeck
<ft@bewatermyfriend.org>
Tue, 7 Apr 2009 11:34:18 +0000
(13:34 +0200)
committer
Michael Prokop
<mika@grml.org>
Fri, 17 Apr 2009 07:32:29 +0000
(09:32 +0200)
debian/changelog
patch
|
blob
|
history
etc/runlevel.conf.hdinstall
patch
|
blob
|
history
etc/runlevel.conf.hdinstall.small
patch
|
blob
|
history
etc/runlevel.conf.livecd
patch
|
blob
|
history
etc/runlevel.conf.livecd.small
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index
906a3c3
..
756f720
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-1,3
+1,9
@@
+grml-etc (1.1.14) unstable; urgency=low
+
+ * Add support for bootlocal.* [Closes: issue170]
+
+ -- Frank Terbeck <ft@grml.org> Tue, 07 Apr 2009 13:32:54 +0200
+
grml-etc (1.1.13) unstable; urgency=low
* /etc/skel/.ipython/ipythonrc: Do not activate the
grml-etc (1.1.13) unstable; urgency=low
* /etc/skel/.ipython/ipythonrc: Do not activate the
diff --git
a/etc/runlevel.conf.hdinstall
b/etc/runlevel.conf.hdinstall
index
52245a3
..
dd751d3
100644
(file)
--- a/
etc/runlevel.conf.hdinstall
+++ b/
etc/runlevel.conf.hdinstall
@@
-6,6
+6,7
@@
# <sort> <off-> <on-levels> <command>
01 - 2 /etc/init.d/bootsplash_start.sh
01 - S /etc/init.d/bootlocal.first
# <sort> <off-> <on-levels> <command>
01 - 2 /etc/init.d/bootsplash_start.sh
01 - S /etc/init.d/bootlocal.first
+01 0,1,6 - /etc/init.d/haltlocal.first
01 - - /etc/init.d/glibc.sh
01 2,3,4,5 0,6 /etc/init.d/libnss-ldap
02 - S /etc/init.d/mountkernfs.sh
01 - - /etc/init.d/glibc.sh
01 2,3,4,5 0,6 /etc/init.d/libnss-ldap
02 - S /etc/init.d/mountkernfs.sh
@@
-186,6
+187,7
@@
28 - S /etc/init.d/cryptdisks
28 - S /etc/init.d/checkfs-loop
29 - 2 /etc/init.d/bootlocal.middle
28 - S /etc/init.d/cryptdisks
28 - S /etc/init.d/checkfs-loop
29 - 2 /etc/init.d/bootlocal.middle
+29 0,1,6 - /etc/init.d/haltlocal.middle
30 - 0,6 /etc/init.d/urandom
30 - 2,3,4,5 /etc/init.d/grml-autoconfig
30 0,1,6 - /etc/init.d/squid
30 - 0,6 /etc/init.d/urandom
30 - 2,3,4,5 /etc/init.d/grml-autoconfig
30 0,1,6 - /etc/init.d/squid
@@
-298,6
+300,7
@@
99 - 2,3,4,5 /etc/init.d/stop-bootlogd
99 - 2 /etc/init.d/bootsplash_end.sh
99 - 2 /etc/init.d/bootlocal.last
99 - 2,3,4,5 /etc/init.d/stop-bootlogd
99 - 2 /etc/init.d/bootsplash_end.sh
99 - 2 /etc/init.d/bootlocal.last
+99 0,1,6 - /etc/init.d/haltlocal.last
99 - 2,3,4,5 /etc/init.d/rc.local
99 - - /etc/init.d/acpi-support
99 - - /etc/init.d/linuxlogo
99 - 2,3,4,5 /etc/init.d/rc.local
99 - - /etc/init.d/acpi-support
99 - - /etc/init.d/linuxlogo
diff --git
a/etc/runlevel.conf.hdinstall.small
b/etc/runlevel.conf.hdinstall.small
index
0274817
..
0a9a8d2
100644
(file)
--- a/
etc/runlevel.conf.hdinstall.small
+++ b/
etc/runlevel.conf.hdinstall.small
@@
-6,6
+6,7
@@
# <sort> <off-> <on-levels> <command>
01 - 2 /etc/init.d/bootsplash_start.sh
01 - S /etc/init.d/bootlocal.first
# <sort> <off-> <on-levels> <command>
01 - 2 /etc/init.d/bootsplash_start.sh
01 - S /etc/init.d/bootlocal.first
+01 0,1,6 - /etc/init.d/haltlocal.first
02 - S /etc/init.d/mountkernfs.sh
03 - S /etc/init.d/udev
04 - S /etc/init.d/mountdevsubfs.sh
02 - S /etc/init.d/mountkernfs.sh
03 - S /etc/init.d/udev
04 - S /etc/init.d/mountdevsubfs.sh
@@
-35,6
+36,7
@@
26 - S /etc/init.d/lvm2
28 - S /etc/init.d/cryptdisks
29 - 2 /etc/init.d/bootlocal.middle
26 - S /etc/init.d/lvm2
28 - S /etc/init.d/cryptdisks
29 - 2 /etc/init.d/bootlocal.middle
+29 0,1,6 - /etc/init.d/haltlocal.middle
30 - 0,6 /etc/init.d/urandom
30 - 2,3,4,5 /etc/init.d/grml-autoconfig
30 0,6 - /etc/init.d/etc-setserial
30 - 0,6 /etc/init.d/urandom
30 - 2,3,4,5 /etc/init.d/grml-autoconfig
30 0,6 - /etc/init.d/etc-setserial
@@
-78,4
+80,5
@@
99 - S /etc/init.d/stop-bootlogd-single
99 - 2 /etc/init.d/bootsplash_end.sh
99 - 2 /etc/init.d/bootlocal.last
99 - S /etc/init.d/stop-bootlogd-single
99 - 2 /etc/init.d/bootsplash_end.sh
99 - 2 /etc/init.d/bootlocal.last
+99 0,1,6 - /etc/init.d/haltlocal.last
# THE LAST LINE IS NEVER READ
# THE LAST LINE IS NEVER READ
diff --git
a/etc/runlevel.conf.livecd
b/etc/runlevel.conf.livecd
index
229c45c
..
cf16953
100644
(file)
--- a/
etc/runlevel.conf.livecd
+++ b/
etc/runlevel.conf.livecd
@@
-16,6
+16,7
@@
# <sort> <off-> <on-levels> <command>
01 - 2 /etc/init.d/bootsplash_start.sh
01 - S /etc/init.d/bootlocal.first
# <sort> <off-> <on-levels> <command>
01 - 2 /etc/init.d/bootsplash_start.sh
01 - S /etc/init.d/bootlocal.first
+01 0,1,6 - /etc/init.d/haltlocal.first
01 - - /etc/init.d/glibc.sh
01 - - /etc/init.d/libnss-ldap
02 - S /etc/init.d/mountkernfs.sh
01 - - /etc/init.d/glibc.sh
01 - - /etc/init.d/libnss-ldap
02 - S /etc/init.d/mountkernfs.sh
@@
-196,6
+197,7
@@
28 - - /etc/init.d/cryptdisks
28 - - /etc/init.d/checkfs-loop
29 - 2 /etc/init.d/bootlocal.middle
28 - - /etc/init.d/cryptdisks
28 - - /etc/init.d/checkfs-loop
29 - 2 /etc/init.d/bootlocal.middle
+29 0,1,6 - /etc/init.d/haltlocal.middle
30 - 0,6 /etc/init.d/urandom
30 - 2,3,4,5 /etc/init.d/grml-autoconfig
30 0,1,6 - /etc/init.d/squid
30 - 0,6 /etc/init.d/urandom
30 - 2,3,4,5 /etc/init.d/grml-autoconfig
30 0,1,6 - /etc/init.d/squid
@@
-308,6
+310,7
@@
99 - - /etc/init.d/stop-bootlogd
99 - 2 /etc/init.d/bootsplash_end.sh
99 - 2 /etc/init.d/bootlocal.last
99 - - /etc/init.d/stop-bootlogd
99 - 2 /etc/init.d/bootsplash_end.sh
99 - 2 /etc/init.d/bootlocal.last
+99 0,1,6 - /etc/init.d/haltlocal.last
99 - - /etc/init.d/rc.local
99 - - /etc/init.d/acpi-support
99 - - /etc/init.d/linuxlogo
99 - - /etc/init.d/rc.local
99 - - /etc/init.d/acpi-support
99 - - /etc/init.d/linuxlogo
diff --git
a/etc/runlevel.conf.livecd.small
b/etc/runlevel.conf.livecd.small
index
294bcb7
..
5ac39af
100644
(file)
--- a/
etc/runlevel.conf.livecd.small
+++ b/
etc/runlevel.conf.livecd.small
@@
-16,6
+16,7
@@
# <sort> <off-> <on-levels> <command>
01 - 2 /etc/init.d/bootsplash_start.sh
01 - S /etc/init.d/bootlocal.first
# <sort> <off-> <on-levels> <command>
01 - 2 /etc/init.d/bootsplash_start.sh
01 - S /etc/init.d/bootlocal.first
+01 0,1,6 - /etc/init.d/haltlocal.first
02 - S /etc/init.d/mountkernfs.sh
03 - S /etc/init.d/udev
04 - S /etc/init.d/mountdevsubfs.sh
02 - S /etc/init.d/mountkernfs.sh
03 - S /etc/init.d/udev
04 - S /etc/init.d/mountdevsubfs.sh
@@
-36,6
+37,7
@@
25 - - /etc/init.d/libdevmapper1.02.1
26 - - /etc/init.d/lvm2
29 - 2 /etc/init.d/bootlocal.middle
25 - - /etc/init.d/libdevmapper1.02.1
26 - - /etc/init.d/lvm2
29 - 2 /etc/init.d/bootlocal.middle
+29 0,1,6 - /etc/init.d/haltlocal.middle
30 - 0,6 /etc/init.d/urandom
30 - 2,3,4,5 /etc/init.d/grml-autoconfig
30 0,6 - /etc/init.d/etc-setserial
30 - 0,6 /etc/init.d/urandom
30 - 2,3,4,5 /etc/init.d/grml-autoconfig
30 0,6 - /etc/init.d/etc-setserial
@@
-62,4
+64,5
@@
99 - 2 /etc/init.d/grml-misc
99 - 2 /etc/init.d/bootsplash_end.sh
99 - 2 /etc/init.d/bootlocal.last
99 - 2 /etc/init.d/grml-misc
99 - 2 /etc/init.d/bootsplash_end.sh
99 - 2 /etc/init.d/bootlocal.last
+99 0,1,6 - /etc/init.d/haltlocal.last
# THE LAST LINE IS NEVER READ!
# THE LAST LINE IS NEVER READ!