From 036c84e85aff0768e1606d22076492b934d161f4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Paul=20H=C3=A4nsch?= <paul@plutz.net>
Date: Tue, 16 Jul 2019 04:02:49 +0200
Subject: [PATCH] MBR partitioning for Raspberry, working password generation

---
 Makefile           | 9 +++++++--
 modules/default.mk | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index da5d3e4..8caf618 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ comma_:=,
 space_:=${nul_} ${nul_}
 
 .PHONY: clean .FORCE
+.PHONY: _config_raspi _partition_raspi
 .PHONY: _qemu _bootstrap _install _copy _config_raspi _config _bootloader _squash
 .PHONY: _target _partition _format _mount _sparse _umount _partcopy _mbr
 
@@ -110,8 +111,8 @@ _copy: _install _mount
 _config_raspi: _copy _mount
 _config: _copy _mount _config_raspi
 _umount: _mount _config
-_partition:
-_partcopy: _partition _umount
+_partition_raspi:
+_partcopy: _partition_raspi _umount
 
 else
 _target:
@@ -223,6 +224,10 @@ ${PROOT}: .FORCE
 	dd count=0 of="$${PROOT}"  # truncate
 	dd bs=1M count=0 seek=${ROOT_MB} of="$${PROOT}"
 
+_partition_raspi: ${VOLUME}
+	printf 'label: dos\n\n: start=2MiB, size=%iMiB, type=c\n: start=%iMiB, size=%iMiB, type=83\n' \
+		${BOOT_MB} "$$((${BOOT_MB} + 2))" ${ROOT_MB} | sfdisk "$${VOLUME}"
+
 _partition: ${VOLUME}
 	printf 'label: gpt\n\n: start=2MiB, size=%iMiB, type=1, attrs="LegacyBIOSBootable"\n: size=%iMiB, type=20\n' \
 		${BOOT_MB} ${ROOT_MB} | sfdisk "$${VOLUME}"
diff --git a/modules/default.mk b/modules/default.mk
index f52cd60..71ec864 100644
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -7,7 +7,7 @@ export rootpass
 .PHONY: _rootpass
 _config: _rootpass
 _rootpass: ${CFGROOT}
-	chroot "$${CFGROOT}" usermod -p "$$(openssl passwd -salt "x$${RANDOM}" "$${rootpass}")" root
+	chroot "$${CFGROOT}" usermod -p "$$(openssl passwd -salt "$$(($${RANDOM-0} + 10))" "$${rootpass}")" root
 endif
 
 ifdef wifi
-- 
2.39.2