diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 14:46:38 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:31:05 +0100 |
| commit | f95e8bc85bf9ba4a5eeacae3406197dc0df4f717 (patch) | |
| tree | 9a31881da81da1b011365bc9f05f4ac99d495aa7 /scripts/live-bottom | |
| parent | 9eaf880cb1944045bac06758a0a7a68ea734595c (diff) | |
| download | live-boot-f95e8bc85bf9ba4a5eeacae3406197dc0df4f717.tar.gz live-boot-f95e8bc85bf9ba4a5eeacae3406197dc0df4f717.zip | |
Adding live-initramfs 1.91.1-1.
Diffstat (limited to 'scripts/live-bottom')
| -rwxr-xr-x | scripts/live-bottom/18hostname | 2 | ||||
| -rwxr-xr-x | scripts/live-bottom/40install_driver_updates | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/scripts/live-bottom/18hostname b/scripts/live-bottom/18hostname index e854eb2..430d0a0 100755 --- a/scripts/live-bottom/18hostname +++ b/scripts/live-bottom/18hostname @@ -27,7 +27,7 @@ log_begin_msg "Setting hostname..." # live-initramfs script echo "$HOSTNAME" > /root/etc/hostname -cat > /root/etc/hosts <<EOF +cat >> /root/etc/hosts <<EOF 127.0.0.1 localhost 127.0.1.1 $HOSTNAME diff --git a/scripts/live-bottom/40install_driver_updates b/scripts/live-bottom/40install_driver_updates index 66ae123..d6f149a 100755 --- a/scripts/live-bottom/40install_driver_updates +++ b/scripts/live-bottom/40install_driver_updates @@ -38,8 +38,10 @@ cp -a /tmp/driver-updates/*.deb "/root$install_dir/" # We cannot leave packages in a bad state. So if the install fails, remove # it. This will get caught in live.log. for deb in "/root$install_dir"/*; do - if ! chroot /root dpkg -i "$install_dir/$deb"; then - chroot /root dpkg -P "${deb%%_*}" + [ -f "$deb" ] || continue + debbase="${deb##*/}" + if ! chroot /root dpkg -i "$install_dir/$debbase"; then + chroot /root dpkg -P "${debbase%%_*}" fi done |