forked from mirrored-repos/manjaro-tools
Compare commits
9 commits
Author | SHA1 | Date | |
---|---|---|---|
|
b1c8ccd1df | ||
|
eb56fd68b3 | ||
|
9e623eec51 | ||
|
14a0b8e906 | ||
|
31e0129837 | ||
|
933beac1ba | ||
|
0f4f15e716 | ||
|
5a783ded77 | ||
|
d87c86eee6 |
3 changed files with 30 additions and 4 deletions
|
@ -354,6 +354,32 @@ make_image_desktop() {
|
||||||
|
|
||||||
chroot_create "${path}" "${packages}"
|
chroot_create "${path}" "${packages}"
|
||||||
|
|
||||||
|
#TODO: tmp workaround to fix Steam fat-tarball download
|
||||||
|
# Grab the steam bootstrap for first boot
|
||||||
|
PKG_URL="https://steamdeck-packages.steamos.cloud/archlinux-mirror/jupiter-main/os/x86_64/steam-jupiter-stable-1.0.0.78-1.2-x86_64.pkg.tar.zst"
|
||||||
|
TMP_PKG="/tmp/package.pkg.tar.zst"
|
||||||
|
OUTPUT_FILE="/tmp/bootstraplinux_ubuntu12_32.tar.xz"
|
||||||
|
TARGET_FILE="${path}/usr/lib/steam/bootstraplinux_ubuntu12_32.tar.xz"
|
||||||
|
curl -o "$TMP_PKG" "$PKG_URL"
|
||||||
|
ZST_CHECKSUM=e94242167c5af25a87b6ffd92963fa8c15263b9a2838bcc0c3a36f918e5ba21c64984be20f718096ff1fed4ec52d49846239695b573db21e1c4ffce9cd493bc1
|
||||||
|
TMP_PKG_CHECKSUM=$(sha512sum ${TMP_PKG} | cut -d " " -f1)
|
||||||
|
if [[ "$ZST_CHECKSUM" == "$TMP_PKG_CHECKSUM" ]]; then
|
||||||
|
tar -I zstd -xvf "$TMP_PKG" usr/lib/steam/bootstraplinux_ubuntu12_32.tar.xz -O > "$OUTPUT_FILE"
|
||||||
|
else
|
||||||
|
msg "Download of ${PKG_URL} failed!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
XZ_CHECKSUM=17b7011fe7ae13834aa1f722724abfc3829ef8632bbabec2ae6b53ef0a9b6f1fc4db61b32056c62401e5aeb001e0f00d9e20f8ea045347b91cbe84ad4d0a919b
|
||||||
|
BS_CHECKSUM=$(sha512sum ${OUTPUT_FILE} | cut -d " " -f1)
|
||||||
|
if [[ "$XZ_CHECKSUM" == "$BS_CHECKSUM" ]]; then
|
||||||
|
mv "$OUTPUT_FILE" "$TARGET_FILE"
|
||||||
|
else
|
||||||
|
msg "Extraction of ${TARGET_FILE} failed!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
[[ -e "$TMP_PKG" ]] && rm "$TMP_PKG"
|
||||||
|
[[ -e "$OUTPUT_FILE" ]] && rm "$OUTPUT_FILE"
|
||||||
|
|
||||||
pacman -Qr "${path}" > "${path}/desktopfs-pkgs.txt"
|
pacman -Qr "${path}" > "${path}/desktopfs-pkgs.txt"
|
||||||
cp "${path}/desktopfs-pkgs.txt" ${iso_dir}/$(gen_iso_fn)-pkgs.txt
|
cp "${path}/desktopfs-pkgs.txt" ${iso_dir}/$(gen_iso_fn)-pkgs.txt
|
||||||
[[ -e ${profile_dir}/desktop-overlay ]] && copy_overlay "${profile_dir}/desktop-overlay" "${path}"
|
[[ -e ${profile_dir}/desktop-overlay ]] && copy_overlay "${profile_dir}/desktop-overlay" "${path}"
|
||||||
|
|
|
@ -392,12 +392,12 @@ write_settings_conf(){
|
||||||
echo " - machineid" >> "$conf" && write_machineid_conf
|
echo " - machineid" >> "$conf" && write_machineid_conf
|
||||||
echo " - fstab" >> "$conf"
|
echo " - fstab" >> "$conf"
|
||||||
if ${oem_used}; then
|
if ${oem_used}; then
|
||||||
msg2 "Skipping to set locale, keyboard and localecfg modules."
|
msg2 "Skipping to set locale and keyboard modules."
|
||||||
else
|
else
|
||||||
echo " - locale" >> "$conf"
|
echo " - locale" >> "$conf"
|
||||||
echo " - keyboard" >> "$conf"
|
echo " - keyboard" >> "$conf"
|
||||||
echo " - localecfg" >> "$conf"
|
|
||||||
fi
|
fi
|
||||||
|
echo " - localecfg" >> "$conf"
|
||||||
echo " - luksopenswaphookcfg" >> "$conf"
|
echo " - luksopenswaphookcfg" >> "$conf"
|
||||||
echo " - luksbootkeyfile" >> "$conf"
|
echo " - luksbootkeyfile" >> "$conf"
|
||||||
echo " - initcpiocfg" >> "$conf"
|
echo " - initcpiocfg" >> "$conf"
|
||||||
|
@ -411,7 +411,7 @@ write_settings_conf(){
|
||||||
else
|
else
|
||||||
echo " - users" >> "$conf"
|
echo " - users" >> "$conf"
|
||||||
fi
|
fi
|
||||||
echo " - displaymanager" >> "$conf" && write_displaymanager_conf
|
#echo " - displaymanager" >> "$conf" && write_displaymanager_conf
|
||||||
if ${mhwd_used}; then
|
if ${mhwd_used}; then
|
||||||
echo " - mhwdcfg" >> "$conf" && write_mhwdcfg_conf
|
echo " - mhwdcfg" >> "$conf" && write_mhwdcfg_conf
|
||||||
else
|
else
|
||||||
|
|
|
@ -213,7 +213,7 @@ init_common(){
|
||||||
|
|
||||||
[[ -z ${log_dir} ]] && log_dir='/var/log/manjaro-tools'
|
[[ -z ${log_dir} ]] && log_dir='/var/log/manjaro-tools'
|
||||||
|
|
||||||
[[ -z ${build_mirror} ]] && build_mirror='https://mirror.alpix.eu/manjaro'
|
[[ -z ${build_mirror} ]] && build_mirror='https://mirror.easyname.at/manjaro'
|
||||||
|
|
||||||
[[ -z ${tmp_dir} ]] && tmp_dir='/tmp/manjaro-tools'
|
[[ -z ${tmp_dir} ]] && tmp_dir='/tmp/manjaro-tools'
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue