mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-10-18 18:44:06 +00:00
Renamed internal variable from IMAGE_FORMAT to IMAGEFORMAT
This commit is contained in:
parent
a9defe1a47
commit
6c1b069004
@ -148,7 +148,7 @@ EXCLUDE=""
|
|||||||
LIST=""
|
LIST=""
|
||||||
SUBARCH=""
|
SUBARCH=""
|
||||||
PROPOSED=""
|
PROPOSED=""
|
||||||
IMAGE_FORMAT="squashfs"
|
IMAGEFORMAT="squashfs"
|
||||||
# must be in the "team / PPA name" form; e.g. "moblin/ppa"; the default PPA
|
# must be in the "team / PPA name" form; e.g. "moblin/ppa"; the default PPA
|
||||||
# name is "ppa", don't omit it
|
# name is "ppa", don't omit it
|
||||||
PPA=""
|
PPA=""
|
||||||
@ -162,7 +162,7 @@ while getopts :d:e:i:I:m:S:s:a:f:p name; do case $name in
|
|||||||
S) USZ="$OPTARG";;
|
S) USZ="$OPTARG";;
|
||||||
s) SUBARCH="$OPTARG";;
|
s) SUBARCH="$OPTARG";;
|
||||||
a) ARCH="$OPTARG";;
|
a) ARCH="$OPTARG";;
|
||||||
f) IMAGE_FORMAT="$OPTARG";;
|
f) IMAGEFORMAT="$OPTARG";;
|
||||||
p) PROPOSED="yes";;
|
p) PROPOSED="yes";;
|
||||||
\?) echo bad usage >&2; exit 2;;
|
\?) echo bad usage >&2; exit 2;;
|
||||||
\:) echo missing argument >&2; exit 2;;
|
\:) echo missing argument >&2; exit 2;;
|
||||||
@ -668,14 +668,14 @@ Pin-Priority: 550
|
|||||||
|
|
||||||
|
|
||||||
# Build our images
|
# Build our images
|
||||||
if [ "$IMAGE_FORMAT" = "ext2" ] || [ "$IMAGE_FORMAT" = "ext3" ]; then
|
if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ]; then
|
||||||
livefs_ext2
|
livefs_ext2
|
||||||
else
|
else
|
||||||
livefs_squash
|
livefs_squash
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Upgrade ext2->ext3 if that's what is requested
|
# Upgrade ext2->ext3 if that's what is requested
|
||||||
if [ "$IMAGE_FORMAT" = "ext3" ]; then
|
if [ "$IMAGEFORMAT" = "ext3" ]; then
|
||||||
tune2fs -j livecd.${FSS}.ext2
|
tune2fs -j livecd.${FSS}.ext2
|
||||||
mv livecd.${FSS}.ext2 livecd.${FSS}.ext3
|
mv livecd.${FSS}.ext2 livecd.${FSS}.ext3
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user