From: Paul Hänsch <paul@plutz.net>
Date: Mon, 25 Jun 2018 20:47:20 +0000 (+0200)
Subject: switch to gpt partitioning
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=b619ac9018f4609d6930513fca31afd90f0c4689;p=bootimage
switch to gpt partitioning
---
diff --git a/Makefile b/Makefile
index c4ccfc7..ff9b317 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,12 @@ GROUPS := sudo
ARCH := amd64
CONFIG := config_base/
-PACKAGES := apt bilibop-lockfs btrfs-tools busybox-static bzip2 ca-certificates cron deborphan extlinux gzip htop ifupdown init iputils-ping irqbalance isc-dhcp-client less live-boot live-boot-initramfs-tools make man-db nbd-client net-tools nmap ntpdate openssh-client openssh-server p7zip-full pciutils rsync squashfs-tools sshfs sudo syslinux-common systemd unace unrar-free unzip vim wget wireless-tools wpasupplicant xz-utils zip
+PACKAGES := apt bilibop-lockfs btrfs-tools busybox-static bzip2 ca-certificates cron deborphan gzip htop ifupdown init iputils-ping irqbalance isc-dhcp-client less live-boot live-boot-initramfs-tools make man-db nbd-client net-tools nmap ntpdate openssh-client openssh-server p7zip-full pciutils rsync squashfs-tools sshfs sudo syslinux syslinux-common syslinux-efi systemd unace unrar-free unzip vim wget wireless-tools wpasupplicant xz-utils zip
include *.mk
+.PRECIOUS: stretch_%_root/bin/sh
+
stretch_%_root/bin/sh:
btrfs subvolume create "$(subst bin/sh,,$@)" || mkdir "$(subst bin/sh,,$@)"
chmod 755 "$(subst bin/sh,,$@)"
@@ -20,7 +22,7 @@ stretch_%_root/: stretch_%_root/bin/sh ${CONFIG} permissions .FORCE
for tree in ${CONFIG}; do for file in apt default timezone; do cp -av "$$tree/etc/$$file" "$@/etc/" || true; done; done
chroot "$@" ln -sf /bin/true /usr/local/sbin/invoke-rc.d
chroot "$@" sh -c 'apt-mark showmanual |xargs apt-mark auto || true'
- chroot "$@" apt-get update
+ -chroot "$@" apt-get update
chroot "$@" umount /proc /dev || true
chroot "$@" mount -t devtmpfs udev /dev
chroot "$@" mount -t proc proc /proc
@@ -36,8 +38,8 @@ stretch_%_config/: stretch_%_root/ ${CONFIG} permissions .FORCE
btrfs subvolume delete "$@" || rm -r "$@" || true
btrfs subvolume snapshot "$<" "$@" || cp -rlv "$<" "$@"
cp -av $(addsuffix /*, ${CONFIG}) "$@"
- chroot "$@" locale-gen
- chroot "$@" update-locale
+ -chroot "$@" locale-gen
+ -chroot "$@" update-locale
chroot "$@" useradd -M -p "$$(printf %s\\n '${PASS}' |mkpasswd -m sha-256 -s)" '${USER}'
for g in ${GROUPS}; do chroot "$@" adduser '${USER}' "$$g"; done
touch "$@"
@@ -48,15 +50,15 @@ stretch_%.squashfs: stretch_%_config/
/dev/sd%: partitions .FORCE
sfdisk ${@} <partitions
- dd of=${@} if=/usr/lib/syslinux/mbr/mbr.bin
+ dd of=${@} if=/usr/lib/syslinux/mbr/gptmbr.bin
/dev/sd%1: /dev/sd% vmlinuz initrd.img syslinux.cfg .FORCE
mkdir -p mount
- mkfs.ext3 -FL SQUASHBOOT ${@}
- mount -t ext3 ${@} mount
+ mkfs.vfat -n SQUASHBOOT ${@}
+ syslinux -i ${@}
+ mount -t vfat ${@} mount
cp -L vmlinuz initrd.img *.squashfs syslinux.cfg Makefile partitions mount/
cp $(addprefix /usr/lib/syslinux/modules/bios/, menu.c32 libutil.c32) mount/
- extlinux -i mount/
umount mount/
sync
diff --git a/config.mk b/config.mk
index 0dd1679..876df43 100644
--- a/config.mk
+++ b/config.mk
@@ -10,11 +10,11 @@ PACKAGES := ${PACKAGES} linux-image-amd64
# PACKAGES := ${PACKAGES} linux-image-686
## Overall XFCE Desktop
-PACKAGES := ${PACKAGES} alsa-utils ark blueman breeze-icon-theme chromium cryptsetup cups-client dosfstools dvd+rw-tools dvdauthor eject exfat-fuse exfat-utils file firmware-linux-free gnome-keyring gparted gtk3-engines-breeze gvfs-backends gvfs-fuse gwenview k3b k3b-i18n kbd kde-l10n-de kde-spectacle kde-style-breeze kde-style-breeze-qt4 leafpad libgl1-mesa-dri locales lvm2 mdadm mesa-utils ntfs-3g okular pavucontrol plymouth plymouth-themes policykit-1 policykit-1-gnome pulseaudio pulseaudio-module-bluetooth recordmydesktop thunar-volman va-driver-all vdpau-driver-all vlc x11-xserver-utils x264 xauth xdotool xfce4 xfce4-terminal xfce4-whiskermenu-plugin xscreensaver xserver-xorg-core xserver-xorg-input-all xserver-xorg-input-wacom xserver-xorg-video-all zenity
+#PACKAGES := ${PACKAGES} alsa-utils ark blueman breeze-icon-theme chromium cryptsetup cups-client dosfstools dvd+rw-tools dvdauthor eject exfat-fuse exfat-utils file firmware-linux-free gnome-keyring gparted gtk3-engines-breeze gvfs-backends gvfs-fuse gwenview k3b k3b-i18n kbd kde-l10n-de kde-spectacle kde-style-breeze kde-style-breeze-qt4 leafpad libgl1-mesa-dri locales lvm2 mdadm mesa-utils ntfs-3g okular pavucontrol plymouth plymouth-themes policykit-1 policykit-1-gnome pulseaudio pulseaudio-module-bluetooth recordmydesktop thunar-volman va-driver-all vdpau-driver-all vlc x11-xserver-utils x264 xauth xdotool xfce4 xfce4-terminal xfce4-whiskermenu-plugin xscreensaver xserver-xorg-core xserver-xorg-input-all xserver-xorg-input-wacom xserver-xorg-video-all zenity
## Common heavy weight desktop applications
-PACKAGES := ${PACKAGES} audacity blender clementine firefox-esr firefox-esr-l10n-de frei0r-plugins gimp hunspell hunspell-de-de hyphen-de inkscape kdenlive krita krita-l10n libreoffice libreoffice-gnome libreoffice-gtk libreoffice-l10n-de libreoffice-pdfimport libreoffice-style-breeze lightning marble thunderbird thunderbird-l10n-de
+#PACKAGES := ${PACKAGES} audacity blender clementine firefox-esr firefox-esr-l10n-de frei0r-plugins gimp hunspell hunspell-de-de hyphen-de inkscape kdenlive krita krita-l10n libreoffice libreoffice-gnome libreoffice-gtk libreoffice-l10n-de libreoffice-pdfimport libreoffice-style-breeze lightning marble thunderbird thunderbird-l10n-de
## Public Terminal / Personal Login
-PACKAGES := ${PACKAGES} nodm
+#PACKAGES := ${PACKAGES} nodm
# PACKAGES := ${PACKAGES} lxdm network-manager network-manager-gnome
diff --git a/initrd.img b/initrd.img
new file mode 120000
index 0000000..aa779de
--- /dev/null
+++ b/initrd.img
@@ -0,0 +1 @@
+stretch_uefi_root/initrd.img
\ No newline at end of file
diff --git a/partitions b/partitions
index 095fc6e..080380e 100644
--- a/partitions
+++ b/partitions
@@ -1,6 +1,6 @@
-label: dos
+label: gpt
unit: sectors
-: start=2048, size=3G, type=83, bootable
-: size=2G, type=82
-: type=83
+: start=2048, size=2G, type=1, attrs="LegacyBIOSBootable"
+: size=2G, type=19
+: type=28
diff --git a/vmlinuz b/vmlinuz
new file mode 120000
index 0000000..327b3aa
--- /dev/null
+++ b/vmlinuz
@@ -0,0 +1 @@
+stretch_uefi_root/vmlinuz
\ No newline at end of file