diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-09-26 12:38:38 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:19:23 +0100 |
| commit | c5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a (patch) | |
| tree | 44a6d3a12cd11067aea2a4d43eb9133cc25bad2f /scripts/build/lb_chroot_hacks | |
| parent | 941a47be0ca3061f54a237583092357d1ff80f7c (diff) | |
| download | vyos-live-build-c5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a.tar.gz vyos-live-build-c5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a.zip | |
Adding debian version 3.0~a1-1.
Diffstat (limited to 'scripts/build/lb_chroot_hacks')
| -rwxr-xr-x | scripts/build/lb_chroot_hacks | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks index b78ba3ab2..47124bedc 100755 --- a/scripts/build/lb_chroot_hacks +++ b/scripts/build/lb_chroot_hacks @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -40,8 +40,7 @@ Create_lockfile .lock case "${LB_DISTRIBUTION}" in squeeze|sid) - if echo "${LB_TASKS}" | grep -qs lxde || - echo "${LB_TASKS}" | grep -qs xfce + if echo "${LB_TASKS}" | grep -qs lxde then GDM="gdm" else @@ -129,7 +128,8 @@ done # Removing openssh-server hostkeys, # they are regenerated by live-config. -rm -f chroot/etc/ssh/ssh_host_*_key chroot/etc/ssh/ssh_host_*_key.pub +#rm -f chroot/etc/ssh/ssh_host_dsa_key chroot/etc/ssh/ssh_host_dsa_key.pub +#rm -f chroot/etc/ssh/ssh_host_rsa_key chroot/etc/ssh/ssh_host_rsa_key.pub # Removing udev mac caching rule rm -f chroot/etc/udev/rules.d/*persistent-net.rules @@ -211,7 +211,7 @@ fi if [ "${LB_DEBIAN_INSTALLER}" = "live" ] then # This is a temporary hack to get rid of fstab; - # needs cleanup in live-initramfs first to proper fix. + # needs cleanup in live-boot first to proper fix. rm -f chroot/etc/fstab fi |