diff options
author | Andrew Cady <d@jerkface.net> | 2016-05-03 10:13:42 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2016-05-03 10:13:42 -0400 |
commit | ec4837a57a137672033d326770b2d978764c1841 (patch) | |
tree | 53871fbbe8edd71fe64bb316bc3523e3bdde67bc /src/xorriso-usb.sh | |
parent | f200e83db0dea1d120cf91d6c71c2d74b00b9706 (diff) |
fix the rest of the bugs
Diffstat (limited to 'src/xorriso-usb.sh')
-rw-r--r-- | src/xorriso-usb.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/xorriso-usb.sh b/src/xorriso-usb.sh index 0d7773d..e912080 100644 --- a/src/xorriso-usb.sh +++ b/src/xorriso-usb.sh | |||
@@ -160,11 +160,16 @@ if [ "$INPUT_DEVICE" ]; then | |||
160 | REMOVE_BTRFS= | 160 | REMOVE_BTRFS= |
161 | ADD_BTRFS= | 161 | ADD_BTRFS= |
162 | fi | 162 | fi |
163 | elif [ "$BOOTLOADER_ONLY" ]; then | ||
164 | REPLACE_INITRD= | ||
165 | REMOVE_BTRFS= | ||
166 | ADD_BTRFS= | ||
163 | else | 167 | else |
164 | REPLACE_INITRD=y | 168 | REPLACE_INITRD=y |
165 | REMOVE_BTRFS=y | 169 | REMOVE_BTRFS=y |
166 | ADD_BTRFS=y | 170 | ADD_BTRFS=y |
167 | fi | 171 | fi |
172 | REPLACE_INITRD= # TODO: fix initrd replacing | ||
168 | 173 | ||
169 | if [ "$QUICK_TEST" ]; then | 174 | if [ "$QUICK_TEST" ]; then |
170 | REMOVE_BTRFS=y | 175 | REMOVE_BTRFS=y |
@@ -200,6 +205,7 @@ xorriso \ | |||
200 | \ | 205 | \ |
201 | \ | 206 | \ |
202 | ${REPLACE_INITRD:+ -rm_r linux -- -add linux="${vmlinuz_dir}" -- } \ | 207 | ${REPLACE_INITRD:+ -rm_r linux -- -add linux="${vmlinuz_dir}" -- } \ |
208 | ${BOOTLOADER_ONLY:+ -add linux="${vmlinuz_dir}" -- } \ | ||
203 | ${REMOVE_BTRFS:+ -rm_r rootfs -- } \ | 209 | ${REMOVE_BTRFS:+ -rm_r rootfs -- } \ |
204 | ${ADD_BTRFS:+ -follow link -add "$@" -- -follow default } \ | 210 | ${ADD_BTRFS:+ -follow link -add "$@" -- -follow default } \ |
205 | \ | 211 | \ |