New commits:
commit ef2ef4c4f71bae44e01f87480bf7ed492d86f51b
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>
init.d: Try to fix bug 9177 some more; this isn't final but should get us
past
breaking things. This tries to do LVM setup multiple times; ideally it
should
only do it when it will work.
commit f55dbdb052a0cb237eb2f0c5df04ec2e28451332
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>
Revert "init.d: fix #7311, proc not showing in /etc/mtab"
This reverts commit 95f13eb1ac5a9dc00b73497abf8ed6c792b0d0c7.
commit 6dd035c985e5fe3f8e4288f0c6f73c14c9991308
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>
dmsetup in init.d/mountall.sh failing is not fatal (simply no dm in
kernel), so omit the retval check
commit d2d735a516812ff647e2bab0d8a15edc5776d490
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>
enable device mapper nodes discovery in init.d/mountall.sh
diff --git a/smgl/init.d/DETAILS b/smgl/init.d/DETAILS
index ffaa50d..c66e268 100755
--- a/smgl/init.d/DETAILS
+++ b/smgl/init.d/DETAILS
@@ -1,7 +1,7 @@
SPELL=init.d
VERSION=2.2.0
LICENSE[0]=GPL
- PATCHLEVEL=14
+ PATCHLEVEL=17
KEYWORDS="smgl"
ENTERED=20030505
SHORT="This is the basic initalization system of SMGL"
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 48e0ae6..c919881 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,9 @@
+2007-01-18 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * init.d/devices: Centralize /proc mounting.
+ * init.d{mountroot.sh,mountall.sh}: Try to not break systems that use
+ an initrd and root LVM (bug 9177).
+ * DETAILS: PATCHLEVEL++.
+
2007-01-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFIGURE: added check before sourcing devices
@@ -5,9 +11,16 @@
* CONFIGURE: fix #9772, restore the DEVICE settings for the second
cast
added missing &&
-2006-10-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
- * init.d/devices: fix #7311, proc not showing in /etc/mtab
- * DETAILS: PATCHLEVEL++
+2006-11-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * init.d/mountall.sh: device mapper may simply fail because no kernel
+ support, so don't bother for error code (spurious red on bood)
+
+2006-10-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * init.d/mountall.sh: add discovery of device mapper
+ nodes (p.ex. crypto swap set up in initramfs)
+
+2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * INSTALL: use TRACK_ROOT when linking #9163
2006-09-23 Flavien Bridault <vlaaad AT sourcemage.org>
* DEPENDS: Check which udev spell we should cast according to the
diff --git a/smgl/init.d/init.d/devices b/smgl/init.d/init.d/devices
index e69c318..a2db4b1 100755
--- a/smgl/init.d/init.d/devices
+++ b/smgl/init.d/init.d/devices
@@ -32,9 +32,6 @@ start_udev()
# mount sysfs
echo "Mounting sysfs at /sys"
mount -n -t sysfs none /sys
- # mount proc
- echo "Mounting /proc"
- mount -n -t proc none /proc
echo "Mounting ramfs at $udev_root"
mount -n -t ramfs none $udev_root
# create some needed stuff
@@ -94,6 +91,9 @@ start_static()
start()
{
+ # mount proc
+ echo "Mounting /proc"
+ mount -a -n -t proc
eval "start_$DEVICES"
}
+scanlvm()
+{
+ # find devices that were set up in initramfs/rd
+ if optional_executable /sbin/dmsetup
+ then
+ echo "(re)Creating device mapper nodes..."
+ # won't check retval because kernel just may lack device mapper
+ /sbin/dmsetup mknodes
+ fi
+
+ if optional_executable /sbin/vgscan && optional_executable /sbin/vgchange
; then
+ echo "Scanning for and initializing all available LVM volume groups..."
+ /sbin/vgscan --ignorelockingfailure --mknodes &&
+ /sbin/vgchange -ay --ignorelockingfailure
+ fi
+}
+
start()
{
required_executable /bin/mount
@@ -51,6 +68,9 @@ start()
raidstart --all
fi