aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-06-08 07:06:36 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-06-11 18:49:42 +0000
commit79f771260719243d28b4732989be6e442df0b5f6 (patch)
tree3415b9ff7cfd27049ed0e1f94d89ba781d65cdd3 /scripts
parent2fed215855d86ade153a701301981d8e26ef6351 (diff)
downloadaports-79f771260719243d28b4732989be6e442df0b5f6.tar.gz
aports-79f771260719243d28b4732989be6e442df0b5f6.tar.bz2
aports-79f771260719243d28b4732989be6e442df0b5f6.tar.xz
scripts/mkimg: shorten volume id of iso image
The volume id cannot be longer than 32 bytes so we need to shorten it a bit
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/mkimg.base.sh4
-rwxr-xr-xscripts/mkimg.standard.sh5
-rwxr-xr-xscripts/mkimg.xen.sh1
3 files changed, 8 insertions, 2 deletions
diff --git a/scripts/mkimg.base.sh b/scripts/mkimg.base.sh
index 04897eaa19..1949f481ab 100755
--- a/scripts/mkimg.base.sh
+++ b/scripts/mkimg.base.sh
@@ -255,7 +255,7 @@ create_image_iso() {
if [ "$ARCH" = ppc64le ]; then
grub-mkrescue --output ${ISO} ${DESTDIR} -follow-links \
-sysid LINUX \
- -volid "alpine-$PROFILE $RELEASE $ARCH"
+ -volid "alpine-${profile_abbrev:-$PROFILE} $RELEASE $ARCH"
else
xorrisofs \
-quiet \
@@ -264,7 +264,7 @@ create_image_iso() {
-joliet \
-rational-rock \
-sysid LINUX \
- -volid "alpine-$PROFILE $RELEASE $ARCH" \
+ -volid "alpine-${profile_abbrev:-$PROFILE} $RELEASE $ARCH" \
$_isolinux \
$_efiboot \
-follow-links \
diff --git a/scripts/mkimg.standard.sh b/scripts/mkimg.standard.sh
index 5153504177..48eb7c3d60 100755
--- a/scripts/mkimg.standard.sh
+++ b/scripts/mkimg.standard.sh
@@ -4,6 +4,7 @@ profile_standard() {
Just enough to get you started.
Network connection is required."
profile_base
+ profile_abbrev="std"
image_ext="iso"
arch="x86 x86_64 ppc64le s390x"
output_format="iso"
@@ -18,10 +19,12 @@ profile_standard() {
profile_extended() {
profile_standard
+ profile_abbrev="ext"
title="Extended"
desc="Most common used packages included.
Suitable for routers and servers.
Runs from RAM."
+ arch="x86 x86_64"
kernel_addons="dahdi-linux xtables-addons zfs spl"
apks="$apks
dahdi-linux dahdi-tools ethtool hwdata lftp links
@@ -58,10 +61,12 @@ profile_extended() {
profile_virt() {
profile_standard
+ profile_abbrev="virt"
title="Virtual"
desc="Similar to standard.
Slimmed down kernel.
Optimized for virtual systems."
+ arch="x86 x86_64"
kernel_addons=
kernel_flavors="virt"
kernel_cmdline="console=tty0 console=ttyS0,115200"
diff --git a/scripts/mkimg.xen.sh b/scripts/mkimg.xen.sh
index c825cf9b1e..e71d04f463 100755
--- a/scripts/mkimg.xen.sh
+++ b/scripts/mkimg.xen.sh
@@ -9,6 +9,7 @@ section_xen() {
profile_xen() {
profile_standard
+ profile_abbrev="xen"
title="Xen"
desc="Build-in support for Xen Hypervisor.
Includes packages targed at Xen usage.