Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

consistently use ESP label for the EFI system partition #259

Merged
merged 1 commit into from Dec 22, 2023
Merged

consistently use ESP label for the EFI system partition #259

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion grml-debootstrap
View file
Open in desktop
Expand Up @@ -807,7 +807,7 @@
prompt_for_release()
{
[ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='bullseye'
RELEASE="$(dialog --stdout --title "${PN}" --default-item $DEFAULT_RELEASE --menu \

Check warning on line 810 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./grml-debootstrap:810:61:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check failure on line 810 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck (suggestion)] reported by reviewdog 🐶


Raw Output:
grml-debootstrap:810:-  RELEASE="$(dialog --stdout --title "${PN}" --default-item $DEFAULT_RELEASE --menu \
grml-debootstrap:810:+  RELEASE="$(dialog --stdout --title "${PN}" --default-item "$DEFAULT_RELEASE" --menu \
"Please enter the Debian release you would like to use for installation:" \
0 50 8 \
buster Debian/10 \
Expand Down Expand Up @@ -862,7 +862,7 @@
{
[ -n "$ISO" ] && DEFAULT_MIRROR='local' || DEFAULT_MIRROR='net'

CHOOSE_MIRROR=$(dialog --stdout --title "$PN" --default-item $DEFAULT_MIRROR \

Check warning on line 865 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./grml-debootstrap:865:64:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check failure on line 865 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck (suggestion)] reported by reviewdog 🐶


Raw Output:
grml-debootstrap:865:-  CHOOSE_MIRROR=$(dialog --stdout --title "$PN" --default-item $DEFAULT_MIRROR \
grml-debootstrap:865:+  CHOOSE_MIRROR=$(dialog --stdout --title "$PN" --default-item "$DEFAULT_MIRROR" \
--menu "Where do you want to install from?" 0 0 0 \
net "install via network (downloading from mirror)" \
local "install from local directory/mirror"
Expand All @@ -873,13 +873,13 @@
[ -n "$MIRROR" ] || MIRROR='http://deb.debian.org/debian'
MIRROR="$(dialog --stdout --title "${PN}" --inputbox \
"Please enter Debian mirror you would like to use for installing packages." \
0 0 $MIRROR)"

Check warning on line 876 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./grml-debootstrap:876:20:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check failure on line 876 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck (suggestion)] reported by reviewdog 🐶


Raw Output:
grml-debootstrap:876:-               0 0 $MIRROR)"
grml-debootstrap:876:+               0 0 "$MIRROR")"
[ $? -eq 0 ] || bailout
else # CHOOSE_MIRROR == local
[ -n "$ISO" ] || ISO='/mnt/mirror'
ISO="$(dialog --stdout --title "${PN}" --inputbox \
"Please enter directory name you would like to use for installing packages." \
0 0 $ISO)"

Check warning on line 882 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./grml-debootstrap:882:20:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check failure on line 882 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck (suggestion)] reported by reviewdog 🐶


Raw Output:
grml-debootstrap:882:-               0 0 $ISO)"
grml-debootstrap:882:+               0 0 "$ISO")"
[ $? -eq 0 ] || bailout
fi
}
Expand Down Expand Up @@ -1517,7 +1517,7 @@
if [ "$ARCH" = 'arm64' ]; then
einfo "Setting up GPT partitions for arm64"
parted -s "${TARGET}" 'mklabel gpt'
parted -s "${TARGET}" 'mkpart EFI fat32 1MiB 10MiB'
parted -s "${TARGET}" 'mkpart ESP fat32 1MiB 10MiB'
parted -s "${TARGET}" 'set 1 boot on'
parted -s "${TARGET}" 'mkpart LINUX ext4 10MiB 100%'
else
Expand Down Expand Up @@ -1844,12 +1844,12 @@
[ -n "$TUNE2FS" ] && echo "TUNE2FS='${TUNE2FS//\'/\'\\\'\'}'" >> "$CHROOT_VARIABLES"
[ -n "$VMSIZE" ] && echo "VMSIZE='${VMSIZE//\'/\'\\\'\'}'" >> "$CHROOT_VARIABLES"

cp $VERBOSE "${CONFFILES}"/chroot-script "${MNTPOINT}"/bin/chroot-script

Check warning on line 1847 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./grml-debootstrap:1847:6:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check failure on line 1847 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck (suggestion)] reported by reviewdog 🐶


Raw Output:
grml-debootstrap:1847:-  cp $VERBOSE "${CONFFILES}"/chroot-script "${MNTPOINT}"/bin/chroot-script
grml-debootstrap:1847:+  cp "$VERBOSE" "${CONFFILES}"/chroot-script "${MNTPOINT}"/bin/chroot-script
chmod 755 "${MNTPOINT}"/bin/chroot-script
[ -d "$MNTPOINT"/etc/debootstrap/ ] || mkdir "$MNTPOINT"/etc/debootstrap/

# make sure we have our files for later use via chroot-script
cp $VERBOSE "${CONFFILES}/config" "${MNTPOINT}"/etc/debootstrap/

Check warning on line 1852 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./grml-debootstrap:1852:6:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check failure on line 1852 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck (suggestion)] reported by reviewdog 🐶


Raw Output:
grml-debootstrap:1852:-  cp $VERBOSE "${CONFFILES}/config"           "${MNTPOINT}"/etc/debootstrap/
grml-debootstrap:1852:+  cp "$VERBOSE" "${CONFFILES}/config"           "${MNTPOINT}"/etc/debootstrap/
# make sure we adjust the configuration variables accordingly:
sed -i "s#RELEASE=.*#RELEASE=\"$RELEASE\"#" "${MNTPOINT}"/etc/debootstrap/config
sed -i "s#TARGET=.*#TARGET=\"$TARGET\"#" "${MNTPOINT}"/etc/debootstrap/config
Expand All @@ -1868,24 +1868,24 @@
PACKAGES_FILE="packages-arm64"
fi

cp $VERBOSE "${_opt_packages:-$CONFFILES/$PACKAGES_FILE}" \

Check warning on line 1871 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./grml-debootstrap:1871:8:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check failure on line 1871 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck (suggestion)] reported by reviewdog 🐶


Raw Output:
grml-debootstrap:1871:-    cp $VERBOSE "${_opt_packages:-$CONFFILES/$PACKAGES_FILE}" \
grml-debootstrap:1871:+    cp "$VERBOSE" "${_opt_packages:-$CONFFILES/$PACKAGES_FILE}" \
"${MNTPOINT}/etc/debootstrap/${PACKAGES_FILE}"
fi

# debconf preseeding:
_opt_debconf=${_opt_debconf:-$CONFFILES/debconf-selections}
[ -f "${_opt_debconf}" ] && [ "$DEBCONF" = 'yes' ] && \
cp $VERBOSE "${_opt_debconf}" "${MNTPOINT}"/etc/debootstrap/debconf-selections

Check warning on line 1878 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./grml-debootstrap:1878:8:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check failure on line 1878 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck (suggestion)] reported by reviewdog 🐶


Raw Output:
grml-debootstrap:1878:-    cp $VERBOSE "${_opt_debconf}" "${MNTPOINT}"/etc/debootstrap/debconf-selections
grml-debootstrap:1878:+    cp "$VERBOSE" "${_opt_debconf}" "${MNTPOINT}"/etc/debootstrap/debconf-selections

# copy scripts that should be executed inside the chroot:
_opt_chroot_scripts=${_opt_chroot_scripts:-$CONFFILES/chroot-scripts/}
[ -d "$_opt_chroot_scripts" ] && [ "$CHROOT_SCRIPTS" = 'yes' ] && {
mkdir -p "${MNTPOINT}"/etc/debootstrap/chroot-scripts
cp -a $VERBOSE "${_opt_chroot_scripts}"/* "${MNTPOINT}"/etc/debootstrap/chroot-scripts/

Check warning on line 1884 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./grml-debootstrap:1884:11:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check failure on line 1884 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck (suggestion)] reported by reviewdog 🐶


Raw Output:
grml-debootstrap:1884:-    cp -a $VERBOSE "${_opt_chroot_scripts}"/* "${MNTPOINT}"/etc/debootstrap/chroot-scripts/
grml-debootstrap:1884:+    cp -a "$VERBOSE" "${_opt_chroot_scripts}"/* "${MNTPOINT}"/etc/debootstrap/chroot-scripts/
}

# notice: do NOT use $CHROOT_VARIABLES inside chroot but statically file instead!
cp $VERBOSE "${CHROOT_VARIABLES}" "${MNTPOINT}"/etc/debootstrap/variables

Check warning on line 1888 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./grml-debootstrap:1888:6:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

cp $VERBOSE -a -L "${CONFFILES}"/extrapackages/ "${MNTPOINT}"/etc/debootstrap/

Expand Down