From da3c8fa64a2a94ed247fdeee6a76f8cac20a0b80 Mon Sep 17 00:00:00 2001 From: r00t Date: Wed, 18 Jan 2017 20:54:13 -0500 Subject: [PATCH] fixing overlayfs, networking --- extra/pre-build.d/etc/initcpio/install/livecd | 1 + extra/pre-build.d/etc/pacman.d/hooks/archiso.hook | 10 ++++++++++ .../NetworkManager-dispatcher.service | 1 + .../multi-user.target.wants/NetworkManager.service | 2 +- extra/pre-build.d/root/packages.both | 2 ++ extra/pre-build.d/root/packages.both.FULL | 2 ++ 6 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 extra/pre-build.d/etc/pacman.d/hooks/archiso.hook create mode 120000 extra/pre-build.d/etc/systemd/system/multi-user.target.wants/NetworkManager-dispatcher.service diff --git a/extra/pre-build.d/etc/initcpio/install/livecd b/extra/pre-build.d/etc/initcpio/install/livecd index 1e782a6..da1db3e 100644 --- a/extra/pre-build.d/etc/initcpio/install/livecd +++ b/extra/pre-build.d/etc/initcpio/install/livecd @@ -14,6 +14,7 @@ build() add_binary "/usr/bin/sed" add_binary "/usr/bin/pkill" add_binary "/usr/bin/curl" + add_binary "/usr/bin/pv" add_full_dir /etc/ssl add_full_dir /etc/ca-certificates diff --git a/extra/pre-build.d/etc/pacman.d/hooks/archiso.hook b/extra/pre-build.d/etc/pacman.d/hooks/archiso.hook new file mode 100644 index 0000000..ee10286 --- /dev/null +++ b/extra/pre-build.d/etc/pacman.d/hooks/archiso.hook @@ -0,0 +1,10 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Target = usr/lib/initcpio/hooks/archiso + +[Action] +Description = Modifying archiso usable space... +When = PostTransaction +Exec = /usr/bin/sed -i -e 's/"size=${cow_spacesize}",//g' -e 's@^[[:space:]]*if\ !\ cp\ "${img}"\ "/run/archiso/copytoram/${img_fullname}"\ ;\ then@if ! pv -pterabT "${img}" > "/run/archiso/copytoram/${img_fullname}" ; then@g' /usr/lib/initcpio/hooks/archiso diff --git a/extra/pre-build.d/etc/systemd/system/multi-user.target.wants/NetworkManager-dispatcher.service b/extra/pre-build.d/etc/systemd/system/multi-user.target.wants/NetworkManager-dispatcher.service new file mode 120000 index 0000000..dc1dc0c --- /dev/null +++ b/extra/pre-build.d/etc/systemd/system/multi-user.target.wants/NetworkManager-dispatcher.service @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/extra/pre-build.d/etc/systemd/system/multi-user.target.wants/NetworkManager.service b/extra/pre-build.d/etc/systemd/system/multi-user.target.wants/NetworkManager.service index e874a9b..dc1dc0c 120000 --- a/extra/pre-build.d/etc/systemd/system/multi-user.target.wants/NetworkManager.service +++ b/extra/pre-build.d/etc/systemd/system/multi-user.target.wants/NetworkManager.service @@ -1 +1 @@ -/usr/lib/systemd/system/NetworkManager.service \ No newline at end of file +/dev/null \ No newline at end of file diff --git a/extra/pre-build.d/root/packages.both b/extra/pre-build.d/root/packages.both index 32723aa..b0fcafe 100644 --- a/extra/pre-build.d/root/packages.both +++ b/extra/pre-build.d/root/packages.both @@ -110,6 +110,7 @@ gst-libav gst-plugins-ugly hashcat hashdeep +haveged hddtemp hdparm hexcurse @@ -289,6 +290,7 @@ thttpd tmon tmux tre +tree truecrack-git truecrypt tor diff --git a/extra/pre-build.d/root/packages.both.FULL b/extra/pre-build.d/root/packages.both.FULL index 32723aa..b0fcafe 100644 --- a/extra/pre-build.d/root/packages.both.FULL +++ b/extra/pre-build.d/root/packages.both.FULL @@ -110,6 +110,7 @@ gst-libav gst-plugins-ugly hashcat hashdeep +haveged hddtemp hdparm hexcurse @@ -289,6 +290,7 @@ thttpd tmon tmux tre +tree truecrack-git truecrypt tor