diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-02-18 17:12:59 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:04 +0100 |
| commit | 9d6a4dedc2736389349345c29d3a8a48b7b70692 (patch) | |
| tree | b227ffc3d77fcd3ba49dabbda5e2674c43f8bea3 /helpers/binary_yaboot | |
| parent | 2dc16bc40d06c08030dc86b736d169a9cd65f791 (diff) | |
| download | live-build-9d6a4dedc2736389349345c29d3a8a48b7b70692.zip live-build-9d6a4dedc2736389349345c29d3a8a48b7b70692.tar.gz | |
Cleaning up usb helpers for a future usb-zip addition.
Diffstat (limited to 'helpers/binary_yaboot')
| -rwxr-xr-x | helpers/binary_yaboot | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/helpers/binary_yaboot b/helpers/binary_yaboot index fdd857d..ef44e6e 100755 --- a/helpers/binary_yaboot +++ b/helpers/binary_yaboot @@ -149,7 +149,7 @@ case "${LH_BINARY_IMAGES}" in DESTDIR_INSTALL="binary/install" ;; - net|tar|usb-hdd) + usb*|net|tar) Echo_error "not yet supported, aborting (FIXME)." exit 1 ;; @@ -272,7 +272,7 @@ fi LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')" case "${LH_BINARY_IMAGES}" in - iso|usb-hdd) + iso|usb*) # Copying yaboot mkdir -p binary/yaboot @@ -288,13 +288,14 @@ case "${LH_BINARY_IMAGES}" in cp -r "${TEMPLATES}"/* binary/yaboot - if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ] - then - mv binary/yaboot/yaboot.conf binary/yaboot/yaboot.conf.tmp - echo "root=/dev/ram" > binary/yaboot/yaboot.conf - cat binary/yaboot/yaboot.conf.tmp >> binary/yaboot/yaboot.conf - rm -f binary/yaboot/yaboot.conf.tmp - fi + case "${LH_BINARY_IMAGES}" in + usb*) + mv binary/yaboot/yaboot.conf binary/yaboot/yaboot.conf.tmp + echo "root=/dev/ram" > binary/yaboot/yaboot.conf + cat binary/yaboot/yaboot.conf.tmp >> binary/yaboot/yaboot.conf + rm -f binary/yaboot/yaboot.conf.tmp + ;; + esac # Configure yaboot templates sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" binary/yaboot/yaboot.conf |