Skip to content
Snippets Groups Projects
Commit 79f77126 authored by Natanael Copa's avatar Natanael Copa
Browse files

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
parent 2fed2158
No related branches found
No related tags found
No related merge requests found
...@@ -255,7 +255,7 @@ create_image_iso() { ...@@ -255,7 +255,7 @@ create_image_iso() {
if [ "$ARCH" = ppc64le ]; then if [ "$ARCH" = ppc64le ]; then
grub-mkrescue --output ${ISO} ${DESTDIR} -follow-links \ grub-mkrescue --output ${ISO} ${DESTDIR} -follow-links \
-sysid LINUX \ -sysid LINUX \
-volid "alpine-$PROFILE $RELEASE $ARCH" -volid "alpine-${profile_abbrev:-$PROFILE} $RELEASE $ARCH"
else else
xorrisofs \ xorrisofs \
-quiet \ -quiet \
...@@ -264,7 +264,7 @@ create_image_iso() { ...@@ -264,7 +264,7 @@ create_image_iso() {
-joliet \ -joliet \
-rational-rock \ -rational-rock \
-sysid LINUX \ -sysid LINUX \
-volid "alpine-$PROFILE $RELEASE $ARCH" \ -volid "alpine-${profile_abbrev:-$PROFILE} $RELEASE $ARCH" \
$_isolinux \ $_isolinux \
$_efiboot \ $_efiboot \
-follow-links \ -follow-links \
......
...@@ -4,6 +4,7 @@ profile_standard() { ...@@ -4,6 +4,7 @@ profile_standard() {
Just enough to get you started. Just enough to get you started.
Network connection is required." Network connection is required."
profile_base profile_base
profile_abbrev="std"
image_ext="iso" image_ext="iso"
arch="x86 x86_64 ppc64le s390x" arch="x86 x86_64 ppc64le s390x"
output_format="iso" output_format="iso"
...@@ -18,10 +19,12 @@ profile_standard() { ...@@ -18,10 +19,12 @@ profile_standard() {
profile_extended() { profile_extended() {
profile_standard profile_standard
profile_abbrev="ext"
title="Extended" title="Extended"
desc="Most common used packages included. desc="Most common used packages included.
Suitable for routers and servers. Suitable for routers and servers.
Runs from RAM." Runs from RAM."
arch="x86 x86_64"
kernel_addons="dahdi-linux xtables-addons zfs spl" kernel_addons="dahdi-linux xtables-addons zfs spl"
apks="$apks apks="$apks
dahdi-linux dahdi-tools ethtool hwdata lftp links dahdi-linux dahdi-tools ethtool hwdata lftp links
...@@ -58,10 +61,12 @@ profile_extended() { ...@@ -58,10 +61,12 @@ profile_extended() {
profile_virt() { profile_virt() {
profile_standard profile_standard
profile_abbrev="virt"
title="Virtual" title="Virtual"
desc="Similar to standard. desc="Similar to standard.
Slimmed down kernel. Slimmed down kernel.
Optimized for virtual systems." Optimized for virtual systems."
arch="x86 x86_64"
kernel_addons= kernel_addons=
kernel_flavors="virt" kernel_flavors="virt"
kernel_cmdline="console=tty0 console=ttyS0,115200" kernel_cmdline="console=tty0 console=ttyS0,115200"
......
...@@ -9,6 +9,7 @@ section_xen() { ...@@ -9,6 +9,7 @@ section_xen() {
profile_xen() { profile_xen() {
profile_standard profile_standard
profile_abbrev="xen"
title="Xen" title="Xen"
desc="Build-in support for Xen Hypervisor. desc="Build-in support for Xen Hypervisor.
Includes packages targed at Xen usage. Includes packages targed at Xen usage.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment