diff options
| author | Dirk von Suchodoletz | 2007-03-21 21:56:44 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-03-21 21:56:44 +0100 |
| commit | 3e4b660a95e2ee371955fd5c4213b0a63ac83068 (patch) | |
| tree | 3c8934311cb3b814dec246a18b7566ccf0874cdb | |
| parent | * did missing adjustments to recent refactoring step, as reported by Dirk (diff) | |
| download | core-3e4b660a95e2ee371955fd5c4213b0a63ac83068.tar.gz core-3e4b660a95e2ee371955fd5c4213b0a63ac83068.tar.xz core-3e4b660a95e2ee371955fd5c4213b0a63ac83068.zip | |
Some simple fixes and additions to the hardware database.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@791 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | initramfs/distro-specs/suse/functions-default | 1 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/bin/hwautocfg | 2 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 2 | ||||
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 1 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/init | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default index 7b425d5a..bf6cfdc9 100644 --- a/initramfs/distro-specs/suse/functions-default +++ b/initramfs/distro-specs/suse/functions-default @@ -46,6 +46,7 @@ sed -e "s,RUN_PARALLEL=.*,RUN_PARALLEL=\"no\"," \ -i /mnt/etc/${D_SYSCONFDIR}/boot # if YaST2 should be runnable (without much effect anyway) on the client testmkd /mnt/var/log/YaST2 +echo "$host_name" > /mnt/etc/HOSTNAME } # linking runlevel scripts diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg index 5125b311..4cc45450 100755 --- a/initramfs/initrd-stuff/bin/hwautocfg +++ b/initramfs/initrd-stuff/bin/hwautocfg @@ -285,7 +285,7 @@ fi [ $DEBUGLEVEL -eq 21 ] && echo "** 1st hwdetection finished at $(sysup)" # load ide drivers first, takes a while to initialize for driver in cmd64x hpt366 piix slc90e66 cs5520 it821x rz1000 \ - triflex aec62xx cs5530 ns87415 sc1200 trm290 alim15x3 \ + ahci triflex aec62xx cs5530 ns87415 sc1200 trm290 alim15x3 \ cy82c693 opti621 serverworks via82cxxx amd74xx pata_amd \ pdc202xx_new siimage atiixp hpt34x pdc202xx_old sis5513; do strinfile " ${driver}" /tmp/hwsetup.info && { diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 778c15aa..0f309e17 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -152,7 +152,7 @@ echo -e "# /etc/hosts - file generated by\n#\t$0:\n#\t$date\ fe00::0\t\tipv6-localnet\nff00::0\t\tipv6-mcastprefix\nff02::1\ \t\tipv6-allnodes\nff02::2\t\tipv6-allrouters\nff02::3\t\t\ ipv6-allhosts\n" >/mnt/etc/hosts -echo -e "$clientip\t$host_name.$domain $host_name\n" >>/mnt/etc/hosts +echo -e "$clientip\t$host_name.$domain_name $host_name\n" >>/mnt/etc/hosts # set up domainname and resolving test -n "$domain_name" && \ diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index a16078f7..3dd3a530 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -621,6 +621,7 @@ cp /tmp/newpasswd /mnt/etc/passwd echo -e "root:"$root_pw":12958:0:10000::::" > /mnt/etc/shadow sed 's/:.*/:!:13078:0:99999:7:::/;/^root.*/d' /tmp/newpasswd \ >> /mnt/etc/shadow +chmod 0640 /mnt/etc/shadow } ############################################################################# diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 0059f9cf..b0712f8d 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -631,7 +631,7 @@ for ticks in 0 200 300 500 800 1000 1200 2000 5000 ; do error "$init_wait" nonfatal done -[ $i -gt 1000 ] && error "$init_errumnt" +[ $ticks -gt 1000 ] && error "$init_errumnt" # check for inittab file (might fail for new style init -> upstart) test -f /mnt/etc/inittab || test -d /mnt/etc/event.d || error "$init_erritab" # close runlevel script for stuff to execute during early bootup |