Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc (6a7a4877a61f8cc2e673080a17cbc8a611627d28)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc (6a7a4877a61f8cc2e673080a17cbc8a611627d28)
  • Date: Wed, 14 Feb 2007 14:11:57 -0600

GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

disk/udev/CONFIGURE | 14 +++++++-------
disk/udev/FINAL | 10 +++++-----
disk/udev/HISTORY | 4 ++++
kernels/hotplug/DETAILS | 2 +-
kernels/hotplug/HISTORY | 5 ++---
kernels/hotplug/PRE_BUILD | 4 +++-
kernels/hotplug/TRIGGERS | 1 -
smgl/init.d/DEPENDS | 36 +++++++++++++++++++++---------------
smgl/init.d/HISTORY | 4 ++++
9 files changed, 47 insertions(+), 33 deletions(-)

New commits:
commit 6a7a4877a61f8cc2e673080a17cbc8a611627d28
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

init.d: Only depend on udev-old when absolutely necessary, i.e. when
udev isn't already installed. If the kernel is old and udev is installed
we can assume it's an old enough version. This will help reduce
unnecessary steps from hotplug -> udev migration (no casting of udev-old
and udev back and forth during upgrade)
(cherry picked from commit e0e5f2d784dadc5a5a5fee06dabacb2cb2562810)
(cherry picked from commit 2b0bf5625b8eba5827001603518d23a3403f7282)

commit 8596f8aba1610faa4d45ea6a73ea319d5dfd86e8
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

hotplug removed old commented-out source url (not worth a history entry)
(cherry picked from commit 0ff06d079b1dd428b81bfc233167de2188fa3bce)
(cherry picked from commit ceb755125d96a2f8882cb2dc260134c04a828883)

commit 0cce2a53e3fcce5975d435ada809efb46911a01d
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

hotplug: duh! had forgotten default_pre_build when i added a PRE_BUILD
(cherry picked from commit a61bfc9aa17c7467e76422603ac2b0c2510038bc)
(cherry picked from commit 56e00e3194a6e000971c30976b29eb514d202819)

commit 50e4cbdc10ed1442f7eee9b0084f38b85dbb7dbb
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "hotplug: more fixing to #13417; dispel self on udev cast" <-
going to implement a better plan to make udev dispel hotplug in FINAL,
thanks to Andrew for the idea

This reverts commit e23633c10801e84927061ff692a3427a2b5697a1.
(cherry picked from commit d816f0d8b5c8cb60198f86e5a4baeb0043cbfcda)
(cherry picked from commit 9e969518e6b8925a627296068e564b45622350ab)

commit 1d9394597d1de438fb1cfbf2517ba8d8a751b243
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "hotplug: forgot to bump patchlevel" <- we won't need this
anymore

This reverts commit c09569b48318c134436bc5cec959edb20f06514c.
(cherry picked from commit 03927836ec38f2f6b4c6bb54d9d52e463419a607)
(cherry picked from commit 63376fa5589ca7464208c0f0d063a7cffefb563c)

commit 0cb6a6061170b6bf45b5dc2a3ff66a360f33347d
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

udev: prompt to dispel hotplug if necessary
(cherry picked from commit 5107f503de9dbe89a707c80f292beedc9ec8fe13)
(cherry picked from commit efecdd618da6c121e2a881d80d42059717bbdfe9)

diff --git a/disk/udev/CONFIGURE b/disk/udev/CONFIGURE
index 0e29a3a..238e4f4 100755
--- a/disk/udev/CONFIGURE
+++ b/disk/udev/CONFIGURE
@@ -43,14 +43,14 @@ fi &&

persistent_add _EXTRAS_TARG &&

-if [[ -x /etc/init.d/runlevels/%S/hotplug ]]
+if spell_ok hotplug
then
- message "You seem to have hotplug's init script enabled. This" \
- "version of udev\nreplaces hotplug as the default" \
- "module autoloading utility, so it is\nrecommended" \
- "that you disable hotplug's init script." &&
+ message "You seem to have hotplug installed. Hotplug has been" \
+ "officially\ndeprecated in favor of udev, and it is" \
+ "highly recommended that\nhotplug is removed after" \
+ "udev has been installed." &&

- config_query HOTPLUG_BOOTDISABLE \
- "Disable init script hotplug?" \
+ config_query UDEV_DISPEL_HOTPLUG \
+ "Dispel hotplug after udev is cast?" \
y
fi
diff --git a/disk/udev/FINAL b/disk/udev/FINAL
index 95264b5..24396fd 100755
--- a/disk/udev/FINAL
+++ b/disk/udev/FINAL
@@ -6,12 +6,12 @@ create_group burning
create_group video
create_group audio

-# disable hotplug init
-if [[ $HOTPLUG_BOOTDISABLE == y ]] &&
- [[ -x /etc/init.d/runlevels/%S/hotplug ]]
+# dispel hotplug
+if [[ $UDEV_DISPEL_HOTPLUG == y ]]
then
- telinit bootdisable hotplug
- persistent_remove HOTPLUG_BOOTDISABLE
+ # we don't care if these fail
+ dispel hotplug
+ persistent_remove UDEV_DISPEL_HOTPLUG
fi &&

# warn of coming changes
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index eb1cd7c..cf8e340 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,7 @@
+2007-01-30 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFIGURE: Prompt to dispel hotplug instead of just bootdisable.
+ * FINAL: Changed bootdisable hotplug to dispel.
+
2007-01-27 Juuso Alasuutari <iuso AT sourcemage.org>
* CONFLICTS: Made 'conflicts udev-old' default to y to
handle upgrades smoother.
diff --git a/kernels/hotplug/DETAILS b/kernels/hotplug/DETAILS
index 362cead..b940aa6 100755
--- a/kernels/hotplug/DETAILS
+++ b/kernels/hotplug/DETAILS
@@ -7,7 +7,7 @@
WEB_SITE=http://linux-hotplug.sourceforge.net/
ENTERED=20020801
LICENSE[0]=GPL
- PATCHLEVEL=3
+ PATCHLEVEL=2
KEYWORDS="kernels"
SHORT="Linux hotplug support tools"
cat << EOF
diff --git a/kernels/hotplug/HISTORY b/kernels/hotplug/HISTORY
index 5e8a107..d9d1ed2 100644
--- a/kernels/hotplug/HISTORY
+++ b/kernels/hotplug/HISTORY
@@ -1,6 +1,5 @@
-2007-01-24 Juuso Alasuutari <iuso AT sourcemage.org>
- * TRIGGERS: Added, on_cast udev dispel_self (#13417).
- * DETAILS: PATCHLEVEL++, removed old commented SOURCE_URL.
+2007-02-13 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Added missing default_pre_build.

2007-01-21 Juuso Alasuutari <iuso AT sourcemage.org>
* PRE_BUILD: Added, abort if udev > 092 is installed (bug #13417).
diff --git a/kernels/hotplug/PRE_BUILD b/kernels/hotplug/PRE_BUILD
index dc20895..68be658 100755
--- a/kernels/hotplug/PRE_BUILD
+++ b/kernels/hotplug/PRE_BUILD
@@ -6,4 +6,6 @@ then
"and hotplug is deprecated in favor of new\nudev" \
"versions, aborting.$DEFAULT_COLOR" &&
return 1
-fi
+fi &&
+
+default_pre_build
diff --git a/kernels/hotplug/TRIGGERS b/kernels/hotplug/TRIGGERS
deleted file mode 100755
index b2f12d1..0000000
--- a/kernels/hotplug/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast udev dispel_self
diff --git a/smgl/init.d/DEPENDS b/smgl/init.d/DEPENDS
index c51feb4..636f6d9 100755
--- a/smgl/init.d/DEPENDS
+++ b/smgl/init.d/DEPENDS
@@ -1,20 +1,26 @@
depends simpleinit-msb &&
-if [ "$DEVICES" == "devfs" ]; then
- optional_depends devfsd "" "" \
- "to make devfs more functional and compatible with the old static /dev"
-elif [ "$DEVICES" == "udev" ]; then
- KERNEL_VERSION=$(get_kernel_version) &&
- PATCHLEVEL=`echo $KERNEL_VERSION | cut -d. -f2` &&
- SUBLEVEL=`echo $KERNEL_VERSION | cut -d. -f3` &&
- tmp=`echo $KERNEL_VERSION | cut -d. -f3 | sed 's/^[0-9]*//g'` &&
- SUBLEVEL=${SUBLEVEL/$tmp/} &&

- # kernel < 2.6.15-rc1 can't use udev > 0.93 tarballs because udevsend has
been removed
- if [ $SUBLEVEL -ge 15 -a $PATCHLEVEL -ge 6 ]; then
- depends udev
+if [[ $DEVICES == devfs ]]
+then
+ optional_depends devfsd \
+ "" \
+ "" \
+ "to make devfs more functional and compatible with \
+the old static /dev"
+elif [[ $DEVICES == udev ]]
+then
+ local VER2=$(echo $VERSION | cut -d. -f2) &&
+ local VER3=$(echo $VERSION | cut -d. -f3) &&
+ VER3=${VER3%%[^0-9]*} &&
+
+ if (( VER2 > 6 )) ||
+ (( VER2 == 6 && VER3 > 14 )) ||
+ spell_ok udev
+ then
+ depends udev
else
- message "You have a kernel < 2.6.15, it is too old for latest udev." &&
- message "We will use udev-old spell instead..." &&
- depends udev-old
+ message "You have a kernel < 2.6.15, it is too old for" \
+ "latest udev.\nUsing udev-old spell instead." &&
+ depends udev-old
fi
fi
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 01bba57..e97420c 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,7 @@
+2007-01-30 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Depend on udev-old instead of udev only when absolutely
+ necessary. Cleaned the code up.
+
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



  • [SM-Commit] GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc (6a7a4877a61f8cc2e673080a17cbc8a611627d28), Jaka Kranjc, 02/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page