diff options
-rw-r--r-- | Makefile | 7 | ||||
-rw-r--r-- | build-deps.control | 3 | ||||
-rw-r--r-- | rootfs/samizdat-gold.yaml | 4 | ||||
-rw-r--r-- | rootfs/samizdat.patch.yaml | 2 | ||||
-rw-r--r-- | rootfs/samizdat.yaml | 9 | ||||
-rwxr-xr-x | src/initrd.sh | 4 | ||||
-rwxr-xr-x | src/mkinitramfs-samizdat | 7 | ||||
-rwxr-xr-x | src/parted-usb.sh | 4 |
8 files changed, 23 insertions, 17 deletions
@@ -125,7 +125,7 @@ include user.mk | |||
125 | 125 | ||
126 | .PHONY: submodules build-submodules $(SUBMODULES) | 126 | .PHONY: submodules build-submodules $(SUBMODULES) |
127 | $(SUBMODULES): stack | 127 | $(SUBMODULES): stack |
128 | @a=$$(cd $@ && git status -uno -s) && (if test -z "$$a"; then set -x; git submodule update --init $@/; fi) | 128 | @a=$$(cd $@ && git status -uno -s) && (if test -z "$$a"; then set -x; git submodule update --init --recursive $@/; fi) |
129 | $(MAKE) -C $@ $(cmd) | 129 | $(MAKE) -C $@ $(cmd) |
130 | 130 | ||
131 | submodules: build-submodules | 131 | submodules: build-submodules |
@@ -135,7 +135,7 @@ build-submodules: $(SUBMODULES) | |||
135 | 135 | ||
136 | .PHONY: update-submodules | 136 | .PHONY: update-submodules |
137 | update-submodules: | 137 | update-submodules: |
138 | git submodule update --init | 138 | git submodule update --init --recursive |
139 | 139 | ||
140 | install-submodules: cmd=install | 140 | install-submodules: cmd=install |
141 | install-submodules: update-submodules $(INSTALL_SUBMODULES) | 141 | install-submodules: update-submodules $(INSTALL_SUBMODULES) |
@@ -351,3 +351,6 @@ install-stamp: install-bin-programs samizdat-paths.sh ${compiled_programs} | |||
351 | $(CP) ${initramfs_conf_files} ${instdir}${samizdat_initramfs_conf_dir} | 351 | $(CP) ${initramfs_conf_files} ${instdir}${samizdat_initramfs_conf_dir} |
352 | $(CP) ${isolinux_files} ${instdir}${samizdat_isolinux_dir} | 352 | $(CP) ${isolinux_files} ${instdir}${samizdat_isolinux_dir} |
353 | touch $@ | 353 | touch $@ |
354 | |||
355 | bootclean: | ||
356 | rm -f samizdat.disk.img boot-disk.template.img boot-disk.img | ||
diff --git a/build-deps.control b/build-deps.control index c6560a3..3feb347 100644 --- a/build-deps.control +++ b/build-deps.control | |||
@@ -3,7 +3,9 @@ Build-Depends: bridge-utils, | |||
3 | build-essential, | 3 | build-essential, |
4 | cryptsetup, | 4 | cryptsetup, |
5 | devscripts, | 5 | devscripts, |
6 | eatmydata, | ||
6 | equivs, | 7 | equivs, |
8 | kpartx, | ||
7 | libbz2-dev, | 9 | libbz2-dev, |
8 | libdpkg-perl, | 10 | libdpkg-perl, |
9 | libgmp-dev, | 11 | libgmp-dev, |
@@ -12,4 +14,5 @@ Build-Depends: bridge-utils, | |||
12 | libz-dev, | 14 | libz-dev, |
13 | parted, | 15 | parted, |
14 | qemu-system-x86, | 16 | qemu-system-x86, |
17 | strace, | ||
15 | uml-utilities | 18 | uml-utilities |
diff --git a/rootfs/samizdat-gold.yaml b/rootfs/samizdat-gold.yaml index f91d13a..4810ac8 100644 --- a/rootfs/samizdat-gold.yaml +++ b/rootfs/samizdat-gold.yaml | |||
@@ -16,4 +16,6 @@ packages: | |||
16 | - ../ssh_8.3p1-1_all.deb | 16 | - ../ssh_8.3p1-1_all.deb |
17 | - ../ssh-askpass-gnome_8.3p1-1_$(debarch).deb | 17 | - ../ssh-askpass-gnome_8.3p1-1_$(debarch).deb |
18 | - sshfs | 18 | - sshfs |
19 | 19 | - firmware-adi | |
20 | - firmware-ivtv | ||
21 | - firmware-b43legacy-installer | ||
diff --git a/rootfs/samizdat.patch.yaml b/rootfs/samizdat.patch.yaml index 2067801..b440cb4 100644 --- a/rootfs/samizdat.patch.yaml +++ b/rootfs/samizdat.patch.yaml | |||
@@ -1,5 +1,5 @@ | |||
1 | parent: samizdat | 1 | parent: samizdat |
2 | seedme: 210000000 | 2 | seedme: 350000000 |
3 | apt-update: true | 3 | apt-update: true |
4 | binaries: | 4 | binaries: |
5 | - './samizdat-update-apt-cache.sh' | 5 | - './samizdat-update-apt-cache.sh' |
diff --git a/rootfs/samizdat.yaml b/rootfs/samizdat.yaml index cf82ce8..4696b67 100644 --- a/rootfs/samizdat.yaml +++ b/rootfs/samizdat.yaml | |||
@@ -7,17 +7,18 @@ binaries: | |||
7 | - cokiki | 7 | - cokiki |
8 | - hosts | 8 | - hosts |
9 | packages: | 9 | packages: |
10 | - sudo | 10 | # - sudo |
11 | - dbus-x11 | 11 | - dbus-x11 |
12 | 12 | ||
13 | skel-files: [] | 13 | skel-files: [] |
14 | 14 | ||
15 | chroot-commands: | 15 | chroot-commands: |
16 | #- "dpkg-statoverride" | ||
16 | - "useradd u -G sudo -m -p '' -s /bin/bash" | 17 | - "useradd u -G sudo -m -p '' -s /bin/bash" |
17 | # - 'loginctl enable-linger u' | 18 | # - 'loginctl enable-linger u' |
18 | - "dpkg --configure sudo" | 19 | #- "dpkg --configure sudo" |
19 | - "touch /var/lib/sudo/lectured/u" | 20 | #- "touch /var/lib/sudo/lectured/u" |
20 | - "echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u" | 21 | - "mkdir -p /etc/sudoers.d; echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u" |
21 | 22 | ||
22 | - "systemctl enable debug-shell" | 23 | - "systemctl enable debug-shell" |
23 | - "DEBIAN_FRONTEND=noninteractive apt-get -f install; true" | 24 | - "DEBIAN_FRONTEND=noninteractive apt-get -f install; true" |
diff --git a/src/initrd.sh b/src/initrd.sh index e363c83..2ec278d 100755 --- a/src/initrd.sh +++ b/src/initrd.sh | |||
@@ -11,7 +11,6 @@ initrd=${samizdat_linux_dir}/initrd.img | |||
11 | vmlinuz=${samizdat_linux_dir}/vmlinuz | 11 | vmlinuz=${samizdat_linux_dir}/vmlinuz |
12 | 12 | ||
13 | conf_dir=$samizdat_initramfs_conf_dir | 13 | conf_dir=$samizdat_initramfs_conf_dir |
14 | apt_dependencies=$samizdat_initrd_files_dir/initrd-dependencies.txt | ||
15 | 14 | ||
16 | get_kernel_version() | 15 | get_kernel_version() |
17 | { | 16 | { |
@@ -44,9 +43,6 @@ force_rebuild() | |||
44 | 43 | ||
45 | rebuild() | 44 | rebuild() |
46 | { | 45 | { |
47 | [ ! -f "$apt_dependencies" ] || | ||
48 | sudo apt-get install -q=10 --no-upgrade -y $(cat "$apt_dependencies") | ||
49 | |||
50 | set -ex | 46 | set -ex |
51 | cp -f /boot/vmlinuz-"${kernel_version}" "$vmlinuz" | 47 | cp -f /boot/vmlinuz-"${kernel_version}" "$vmlinuz" |
52 | /usr/sbin/mkinitramfs -d "$conf_dir" -o "$initrd" "${kernel_version}" || force_rebuild | 48 | /usr/sbin/mkinitramfs -d "$conf_dir" -o "$initrd" "${kernel_version}" || force_rebuild |
diff --git a/src/mkinitramfs-samizdat b/src/mkinitramfs-samizdat index 4fc6866..566389e 100755 --- a/src/mkinitramfs-samizdat +++ b/src/mkinitramfs-samizdat | |||
@@ -5,15 +5,16 @@ f() | |||
5 | sudo /usr/sbin/mkinitramfs \ | 5 | sudo /usr/sbin/mkinitramfs \ |
6 | -d /usr/local/lib/samizdat-rhizome/initramfs-tools/ \ | 6 | -d /usr/local/lib/samizdat-rhizome/initramfs-tools/ \ |
7 | -o "/boot/initrd.img-$1.samizdat" \ | 7 | -o "/boot/initrd.img-$1.samizdat" \ |
8 | -k "$1" | 8 | -k "$1" || return |
9 | sudo ln -sf "initrd.img-$1.samizdat" /boot/initrd.img | ||
9 | } | 10 | } |
10 | 11 | ||
11 | if [ "$1" ] | 12 | if [ "$1" ] |
12 | then | 13 | then |
13 | f "$1" | 14 | f "$1" || exit |
15 | sudo ln -sf "vmlinuz-$1" /boot/vmlinuz | ||
14 | else | 16 | else |
15 | l=$(readlink /boot/vmlinuz) | 17 | l=$(readlink /boot/vmlinuz) |
16 | v=${l#vmlinuz-} | 18 | v=${l#vmlinuz-} |
17 | f "$v" | 19 | f "$v" |
18 | ln -sf "initrd.img-$v.samizdat" /boot/initrd.img | ||
19 | fi | 20 | fi |
diff --git a/src/parted-usb.sh b/src/parted-usb.sh index d6d0873..919aae2 100755 --- a/src/parted-usb.sh +++ b/src/parted-usb.sh | |||
@@ -217,9 +217,9 @@ samizdat_linux_dir=/boot | |||
217 | 217 | ||
218 | 218 | ||
219 | 219 | ||
220 | #ROOTFS=rootfs/samizdat.seed.btrfs | 220 | ROOTFS=rootfs/samizdat-gold.seed.btrfs |
221 | #PATCHFS=rootfs/samizdat.patch.btrfs | 221 | #PATCHFS=rootfs/samizdat.patch.btrfs |
222 | #GPG_INPUT_DIR=/root/.gnupg | 222 | GPG_INPUT_DIR=/root/.gnupg |
223 | 223 | ||
224 | : ${GPG_INPUT_DIR:=/cdrom/gnupghome} | 224 | : ${GPG_INPUT_DIR:=/cdrom/gnupghome} |
225 | : ${GRUB_CONFIG:=conf/grub.cfg} | 225 | : ${GRUB_CONFIG:=conf/grub.cfg} |