diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-13 17:18:15 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-13 17:18:15 +0200 |
| commit | 64d6047788b6201a9b026a6841dd25f8d0a0d00b (patch) | |
| tree | 95aafc346b70447f7dd2829f83f59d8df15d4d58 /scripts/create.sh | |
| parent | d5aed1c97f81f422af91c1bd4d7994dc54beabe1 (diff) | |
| parent | 7297ef1c47935fb17e49cac8379908e631763566 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts/create.sh')
| -rwxr-xr-x | scripts/create.sh | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/scripts/create.sh b/scripts/create.sh index 505549247..79401fda9 100755 --- a/scripts/create.sh +++ b/scripts/create.sh @@ -55,7 +55,7 @@ Syntax: $me [-c cfgfssize] [+g] [-i imagesize] [-p panictime] [-s serialspeed] [-t] [-T imagetype] [+U] target.ima source.tgz Explanation/Defaults: -c: minimum 0, maximum 5, default 1 (MiB) - +g: disables installing GNU GRUB 2 (-g enables it, default) + -g: enable installing GNU GRUB 2 -i: total image, default 512 (MiB; max. approx. 2 TiB) -p: default 10 (seconds; 0 disables; max. 300) -s: default 115200 (bps, others: 9600 19200 38400 57600) @@ -66,7 +66,7 @@ EOF } cfgfs=1 -usegrub=1 +usegrub=0 tgtmib=512 panicreboot=10 speed=115200 @@ -80,7 +80,6 @@ while getopts "c:ghi:p:s:tT:" ch; do usage fi ;; (g) usegrub=1 ;; - (+g) usegrub=0 ;; (h) usage 0 ;; (i) if (( (tgtmib = OPTARG) < 7 || tgtmib > 2097150 )); then print -u2 "$me: -i $OPTARG out of bounds" @@ -153,7 +152,7 @@ else fi if (( usegrub )); then - tar -xOzf "$src" usr/share/grub-bin/core.img >"$T/core.img" + tar -xOzf "$src" boot/grub/core.img >"$T/core.img" integer coreimgsz=$($statcmd "$T/core.img") if (( coreimgsz < 1024 )); then print -u2 core.img is probably too small: $coreimgsz @@ -274,12 +273,6 @@ if (( usegrub )); then print "\tlinux /boot/kernel $linuxargs" print '}' ) >boot/grub/grub.cfg - set -A grubfiles - ngrubfiles=0 - for a in usr/lib/grub/*-pc/{*.mod,efiemu??.o,command.lst,moddep.lst,fs.lst,handler.lst,parttool.lst}; do - [[ -e $a ]] && grubfiles[ngrubfiles++]=$a - done - cp "${grubfiles[@]}" boot/grub/ fi print "Creating ext2fs filesystem image..." |