From: Paul Hänsch 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 ${@}