diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:09 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:18:29 +0100 |
| commit | 86726af9f5e7873d6cdbbe108fae1c41b1b67db0 (patch) | |
| tree | dc743644cb41c5faffc58a67b6603d4b1342d41a /helpers/lh_binary_yaboot | |
| parent | 97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179 (diff) | |
| download | live-build-86726af9f5e7873d6cdbbe108fae1c41b1b67db0.zip live-build-86726af9f5e7873d6cdbbe108fae1c41b1b67db0.tar.gz | |
Adding live-helper 1.0~a11-1.
Diffstat (limited to 'helpers/lh_binary_yaboot')
| -rwxr-xr-x | helpers/lh_binary_yaboot | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot index b8da499..23187f3 100755 --- a/helpers/lh_binary_yaboot +++ b/helpers/lh_binary_yaboot @@ -126,12 +126,34 @@ fi if [ -n "${LIVE_USERNAME}" ] then - LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}" + case "${LH_INITRAMFS}" in + casper) + LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}" + ;; + + live-initramfs) + if [ "${LIVE_USERNAME}" != "user" ] + then + LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}" + fi + ;; + esac fi if [ -n "${LIVE_HOSTNAME}" ] then - LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}" + case "${LIVE_INITRAMFS}" in + casper) + LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}" + ;; + + live-initramfs) + if [ "${LIVE_HOSTNAME}" != "debian" ] + then + LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}" + fi + ;; + esac fi LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`" |