diff options
| author | Dirk von Suchodoletz | 2006-03-30 23:14:48 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-03-30 23:14:48 +0200 |
| commit | 4e0ad0cb16445b296cf0c70c7111626c577083e3 (patch) | |
| tree | 113c9c8de48d0f80dfe68a3e3dd1af6d7d55994a /initrd/initrd-stuff | |
| parent | more debug level, exclude-common for rsync (files and directories common (diff) | |
| download | core-4e0ad0cb16445b296cf0c70c7111626c577083e3.tar.gz core-4e0ad0cb16445b296cf0c70c7111626c577083e3.tar.xz core-4e0ad0cb16445b296cf0c70c7111626c577083e3.zip | |
mostly bugfixes and small improvements ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@133 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff')
| -rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 4 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 4 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/init | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index c09157e2..5b084ead 100755 --- a/initrd/initrd-stuff/bin/hwautocfg +++ b/initrd/initrd-stuff/bin/hwautocfg @@ -263,7 +263,7 @@ done . /etc/distro-functions # heavy debugging output in level 3 and above ... -[ $DEBUGLEVEL -gt 2 ] && set -x +[ $DEBUGLEVEL -gt 3 ] && set -x # set X11 configuration file if [ -n "${D_XF86CONFFILE}" ] ; then @@ -479,7 +479,7 @@ if strinstr "/var/X11R6" "$link" ; then done fi # wait for completion of Xorg configuration -waitfor /tmp/xready 1000 +waitfor /tmp/xready 10000 cp /etc/xorg.conf ${D_XF86CONFFILE} echo "finished" > /tmp/hwcfg diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 1f12f279..3c8731e7 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -24,7 +24,7 @@ . /mnt/etc/${D_SYSCONFDIR}/logfile # heavy debugging output in level 3 and above ... -[ $DEBUGLEVEL -gt 2 ] && set -x +[ $DEBUGLEVEL -gt 3 ] && set -x ####################################################################### # copy distro specific scripts, programs, libraries and configs @@ -145,7 +145,7 @@ esac ####################################################################### # # run distro specific configuration function -config-distro +config_distro ####################################################################### diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index 7081cd3e..d239e170 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -163,11 +163,9 @@ if [ "${DEBUGLEVEL}" -gt 0 ] ; then # of the variable LOGFILE="/var/log/dxs-boot.log" echo "1 4 1 7" >/proc/sys/kernel/printk - [ "${DEBUGLEVEL}" -eq 2 ] && MODPRV="-v" + [ "${DEBUGLEVEL}" -ge 2 ] && MODPRV="-v" [ "${DEBUGLEVEL}" -gt 3 ] && { set -x - # modprobe should be verbose - MODPRV="-v"; # and the kernel too echo "7 7 7 7" >/proc/sys/kernel/printk; } else |