diff options
| author | Jaka Kranjc | 2007-03-10 19:45:16 +0100 |
|---|---|---|
| committer | Jaka Kranjc | 2007-03-10 19:45:16 +0100 |
| commit | fff3b74dede67e2aa332a223ff2fc63314dddae9 (patch) | |
| tree | f53e0f8c7f6774677e3eaefdc91a36a265d6beb8 | |
| parent | fec74f468bb68dbc7f2c75406fe61d4a1098af25 (diff) | |
init.d: fixed kernel version checking in DEPENDS that erroneously caused
udev-old to be pulled in as dependency in some cases
(cherry picked from commit c096a4f91a4de3bb07ce858fa95a629fd8db2546)
Conflicts:
smgl/init.d/HISTORY
| -rwxr-xr-x | smgl/init.d/DEPENDS | 7 | ||||
| -rw-r--r-- | smgl/init.d/HISTORY | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/smgl/init.d/DEPENDS b/smgl/init.d/DEPENDS index 636f6d9726..b4da7f1b8b 100755 --- a/smgl/init.d/DEPENDS +++ b/smgl/init.d/DEPENDS @@ -9,9 +9,10 @@ then 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]*} && + local KVER=$(get_kernel_version) && + local VER2=$(echo $KVER | cut -d. -f2) && + local VER3=$(echo $KVER | cut -d. -f3) && + VER3=${VER3%%[^0-9]*} && if (( VER2 > 6 )) || (( VER2 == 6 && VER3 > 14 )) || diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY index f0842b040c..6df8ffe520 100644 --- a/smgl/init.d/HISTORY +++ b/smgl/init.d/HISTORY @@ -1,3 +1,7 @@ +2007-03-05 Juuso Alasuutari <iuso@sourcemage.org> + * DEPENDS: Fixed error in kernel version checking that in some + cases erroneously caused udev-old to be pulled in. + 2007-02-14 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * DETAILS: PATCHLEVEL++ for stable 0.7 release purposes |