diff options
author | Nico Dietrich | 2006-04-04 17:13:47 +0200 |
---|---|---|
committer | Nico Dietrich | 2006-04-04 17:13:47 +0200 |
commit | 0a999cf9f2c5d24bd79ec65b1b5fb290a5b14c75 (patch) | |
tree | fccb54c3bae3945f1f2d7549acb8dee8b4b696f5 /initrd | |
parent | s/sysconfig/$var/ (diff) | |
download | core-0a999cf9f2c5d24bd79ec65b1b5fb290a5b14c75.tar.gz core-0a999cf9f2c5d24bd79ec65b1b5fb290a5b14c75.tar.xz core-0a999cf9f2c5d24bd79ec65b1b5fb290a5b14c75.zip |
Bug fixed at kernel detection
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@151 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd')
-rwxr-xr-x | initrd/mkdxsinitrd | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd index d886061e..63903a51 100755 --- a/initrd/mkdxsinitrd +++ b/initrd/mkdxsinitrd @@ -407,7 +407,7 @@ if [ -z "$KERNVER" ] ; then fi # if no vmlinuz found, go for vmlinuz-x.yz.uv... if [ -z "$KERNVER" ] ; then - KERNVER=`ls -lt /nfsroot/boot/vmlinuz* | grep vmlinuz | sed -n "1,1s/.*vmlinuz-//p"` + KERNVER=`ls -lt ${ROOTDIR}/boot/vmlinuz* | grep vmlinuz | sed -n "1,1s/.*vmlinuz-//p"` echo "No vmlinuz-link found. Using kernel version "$KERNVER fi @@ -487,8 +487,9 @@ elif [ -f ../installer/default_files/machine-setup_default ] ; then cp ../installer/default_files/machine-setup_default \ ${INSTDIR}/etc/machine-setup else - echo -e "# default for machine-setup does not exist\nroot logins are \ -disabled\nroot_pw='!'" > ${INSTDIR}/etc/machine-setup + #inserted password for root for debugging purposes + echo -e "# default for machine-setup does not exist\n# root logins are \ +disabled\nroot_pw='"'$1$T7VD/mmQ$aCP1WEaWplEsHe9khv4kK.'"'" > ${INSTDIR}/etc/machine-setup fi ######################################################################### |