Raspi2-3_GenImage Commit - r611:230e22969801 · Collaboration Tremplin des Sciences

Unknown -

r611:230e22969801

parent child

Context file:

r611:230e22969801

bootstrap.d/12-locale.sh +8 0

             # Install and setup timezone
             echo "${TIMEZONE}" > "${ETC_DIR}/timezone"
+            if [ -f "${ETC_DIR}/localtime" ]; then
+                # 1. If 11-apt.sh upgrades the package 'tzdata', '/etc/localtime' was created
+                #    because 'dpkg-reconfigure -f noninteractive tzdata' was executed by apt-get.
+                # 2. If '/etc/localtime' exists, our execution of 'dpkg-reconfigure -f noninteractive tzdata'
+                #    will ignore the our timezone set in '/etc/timezone'.
+                # 3. Removing /etc/localtime will solve this.
+                rm -f "${ETC_DIR}/localtime"
+            fi
             chroot_exec dpkg-reconfigure -f noninteractive tzdata
             # Install and setup default locale and keyboard configuration

bootstrap.d/14-fstab.sh +68 -71

@@ -33,84 +33,81 if [ "$ENABLE_USBBOOT" = true ] ; then
33	sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/fstab"	33	sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/fstab"
34		34
35	# Add usb/sda2 disk to crypttab	35	# Add usb/sda2 disk to crypttab
36	sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/crypttab"	36	if [ "$ENABLE_CRYPTFS" = true ] ; then
		37	sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/crypttab"
		38	fi
37	fi	39	fi
38		40
39	# Generate initramfs file	41	# Generate initramfs file
40	if [ "$ENABLE_INITRAMFS" = true ] ; then	42	if [ "$ENABLE_INITRAMFS" = true ] ; then
41	if [ "$ENABLE_CRYPTFS" = true ] ; then	43	if [ "$ENABLE_CRYPTFS" = true ] ; then
42	# Include initramfs scripts to auto expand encrypted root partition	44	# Include initramfs scripts to auto expand encrypted root partition
43	if [ "$EXPANDROOT" = true ] ; then	45	if [ "$EXPANDROOT" = true ] ; then
44	install_exec files/initramfs/expand_encrypted_rootfs "${ETC_DIR}/initramfs-tools/scripts/init-premount/expand_encrypted_rootfs"	46	install_exec files/initramfs/expand_encrypted_rootfs "${ETC_DIR}/initramfs-tools/scripts/init-premount/expand_encrypted_rootfs"
45	install_exec files/initramfs/expand-premount "${ETC_DIR}/initramfs-tools/scripts/local-premount/expand-premount"	47	install_exec files/initramfs/expand-premount "${ETC_DIR}/initramfs-tools/scripts/local-premount/expand-premount"
46	install_exec files/initramfs/expand-tools "${ETC_DIR}/initramfs-tools/hooks/expand-tools"	48	install_exec files/initramfs/expand-tools "${ETC_DIR}/initramfs-tools/hooks/expand-tools"
47	fi	49	fi
48		50
49	if [ "$ENABLE_DHCP" = false ] ; then	51	if [ "$ENABLE_DHCP" = false ] ; then
50	# Get cdir from NET_ADDRESS e.g. 24	52	# Get cdir from NET_ADDRESS e.g. 24
51	cdir=$(printf ${NET_ADDRESS} \| cut -d '/' -f2)	53	cdir=$(printf ${NET_ADDRESS} \| cut -d '/' -f2)
52		54
53	# Convert cdir ro netmask e.g. 24 to 255.255.255.0	55	# Convert cdir ro netmask e.g. 24 to 255.255.255.0
54	NET_MASK=$(cdr2mask "$cdir")	56	NET_MASK=$(cdr2mask "$cdir")
55		57
56	# Write static ip settings to "${ETC_DIR}"/initramfs-tools/initramfs.conf	58	# Write static ip settings to "${ETC_DIR}"/initramfs-tools/initramfs.conf
57	sed -i "\$aIP=${NET_ADDRESS}::${NET_GATEWAY}:${NET_MASK}:${HOSTNAME}:" "${ETC_DIR}"/initramfs-tools/initramfs.conf	59	sed -i "\$aIP=${NET_ADDRESS}::${NET_GATEWAY}:${NET_MASK}:${HOSTNAME}:" "${ETC_DIR}"/initramfs-tools/initramfs.conf
58		60	fi
59	# Regenerate initramfs	61
60	chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"	62	if [ "$CRYPTFS_DROPBEAR" = true ]; then
61	fi	63	if [ -n "$CRYPTFS_DROPBEAR_PUBKEY" ] && [ -f "$CRYPTFS_DROPBEAR_PUBKEY" ] ; then
62		64	install_readonly "${CRYPTFS_DROPBEAR_PUBKEY}" "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
63	if [ "$CRYPTFS_DROPBEAR" = true ]; then	65	cat "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub >> "${ETC_DIR}"/dropbear-initramfs/authorized_keys
64	if [ -n "$CRYPTFS_DROPBEAR_PUBKEY" ] && [ -f "$CRYPTFS_DROPBEAR_PUBKEY" ] ; then	66	else
65	install_readonly "${CRYPTFS_DROPBEAR_PUBKEY}" "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub	67	# Create key
66	cat "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub >> "${ETC_DIR}"/dropbear-initramfs/authorized_keys	68	chroot_exec /usr/bin/dropbearkey -t rsa -f /etc/dropbear-initramfs/id_rsa.dropbear
67	else	69
68	# Create key	70	# Convert dropbear key to openssh key
69	chroot_exec /usr/~~bin/dropbearkey~~ -t ~~rsa -f~~ /etc/dropbear-initramfs/id_rsa.dropbear	71	chroot_exec /usr/lib/dropbear/dropbearconvert dropbear openssh /etc/dropbear-initramfs/id_rsa.dropbear /etc/dropbear-initramfs/id_rsa
70		72
71	# Convert dropbear key to openssh key	73	# Get Public Key Part
72	chroot_exec /usr/lib/dropbear~~/dropbearconvert~~ ~~dropbear~~ ~~openssh~~ /etc/dropbear-initramfs/id_rsa.dropbear /etc/dropbear-initramfs/id_rsa	74	chroot_exec /usr/bin/dropbearkey -y -f /etc/dropbear-initramfs/id_rsa.dropbear \| chroot_exec tee /etc/dropbear-initramfs/id_rsa.pub
73		75
74	# Get Public Key Part	76	# Delete unwanted lines
75	chroot_exec /usr/bin/dropbearkey -y -f /etc/dropbear-initramfs/id_rsa.dropbear \| chroot_exec tee /etc/dropbear-initramfs/id_rsa.pub	77	sed -i '/Public/d' "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
76		78	sed -i '/Fingerprint/d' "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
77	# Delete unwanted lines	79
78	sed -i '/Public/d' "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub	80	# Trust the new key
79	sed -i '/Fingerprint/d' "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub	81	cat "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub > "${ETC_DIR}"/dropbear-initramfs/authorized_keys
80		82
81	# Trust the new key	83	# Save Keys - convert with putty from rsa/openssh to puttkey
82	~~cat~~ "${ETC_DIR}"/dropbear-initramfs/id_rsa~~.pub >~~ "${E~~TC_~~DIR}"/dropbear-initramfs~~/authorized~~_keys	84	cp -f "${ETC_DIR}"/dropbear-initramfs/id_rsa "${BASEDIR}"/dropbear_initramfs_key.rsa
83		85	fi
84	# Save Keys - convert with putty from rsa/openssh to puttkey	86
85	cp -f "${ETC_DIR}"/dropbear-initramfs/id_rsa "${BASEDIR}"/dropbear_initramfs_key.rsa	87	# Get unlock script
86		88	install_exec files/initramfs/crypt_unlock.sh "${ETC_DIR}"/initramfs-tools/hooks/crypt_unlock.sh
87	# Get unlock script	89
88	install_exec files/initramfs/crypt_unlock.sh "${ETC_DIR}"/initramfs-tools/hooks/crypt_unlock.sh	90	# Enable Dropbear inside initramfs
89		91	printf "#\n# DROPBEAR: [ y \| n ]\n#\n\nDROPBEAR=y\n" >> "${ETC_DIR}/initramfs-tools/initramfs.conf"
90	# Enable Dropbear inside initramfs	92
91	printf "#\n# DROPBEAR: [ y \| n ]\n#\n\nDROPBEAR=y\n" >> "${ETC_DIR}/initramfs-tools/initramfs.conf"	93	# Enable Dropbear inside initramfs
92		94	sed -i "54 i sleep 5" "${R}"/usr/share/initramfs-tools/scripts/init-premount/dropbear
93	# Enable Dropbear inside initramfs	95	else
94	sed -i "54 i sleep 5" "${R}"/usr/share/initramfs-tools/scripts/init-premount/dropbear	96	# Disable SSHD inside initramfs
95	fi	97	printf "#\n# DROPBEAR: [ y \| n ]\n#\n\nDROPBEAR=n\n" >> "${ETC_DIR}/initramfs-tools/initramfs.conf"
		98	fi
		99
		100	# Add cryptsetup modules to initramfs
		101	printf "#\n# CRYPTSETUP: [ y \| n ]\n#\n\nCRYPTSETUP=y\n" >> "${ETC_DIR}/initramfs-tools/conf-hook"
		102
		103	# Dummy mapping required by mkinitramfs
		104	echo "0 1 crypt $(echo "${CRYPTFS_CIPHER}" \| cut -d ':' -f 1) ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 7:0 4096" \| chroot_exec dmsetup create "${CRYPTFS_MAPPING}"
		105
		106	# Remove dummy mapping
		107	chroot_exec cryptsetup close "${CRYPTFS_MAPPING}"
96	else	108	else
97	# Disable SSHD inside initramfs
98	printf "#\n# DROPBEAR: [ y \| n ]\n#\n\nDROPBEAR=n\n" >> "${ETC_DIR}/initramfs-tools/initramfs.conf"
99	fi
100
101	# Add cryptsetup modules to initramfs
102	printf "#\n# CRYPTSETUP: [ y \| n ]\n#\n\nCRYPTSETUP=y\n" >> "${ETC_DIR}/initramfs-tools/conf-hook"
103		109
104	# Dummy mapping required by mkinitramfs	110	fi
105	echo "0 1 crypt $(echo "${CRYPTFS_CIPHER}" \| cut -d ':' -f 1) ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 7:0 4096" \| chroot_exec dmsetup create "${CRYPTFS_MAPPING}"	111	# Generate initramfs without encrypted root partition support
106		112	chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
107	# Generate initramfs with encrypted root partition support
108	chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
109
110	# Remove dummy mapping
111	chroot_exec cryptsetup close "${CRYPTFS_MAPPING}"
112	else
113	# Generate initramfs without encrypted root partition support
114	chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
115	fi
116	fi	113	fi

General Comments 0

Écrire
Preview

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages