| 1 |
commit: 778d69698e8f12efebb886535c434f3f8621df90 |
| 2 |
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 2 04:37:37 2015 +0000 |
| 4 |
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 2 04:37:40 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=778d6969 |
| 7 |
|
| 8 |
tools-hardened/desktop: Code cleanup for build scripts |
| 9 |
|
| 10 |
Code cleanup is simply replacements of spaces to tabs to make all |
| 11 |
lines coincide with one another. |
| 12 |
|
| 13 |
--- |
| 14 |
tools-hardened/desktop/fluxbox-run.sh | 2 +- |
| 15 |
tools-hardened/desktop/gnome3-run.sh | 2 +- |
| 16 |
tools-hardened/desktop/run-base.sh | 4 ++-- |
| 17 |
tools-hardened/desktop/xfce4-run.sh | 4 ++-- |
| 18 |
4 files changed, 6 insertions(+), 6 deletions(-) |
| 19 |
|
| 20 |
diff --git a/tools-hardened/desktop/fluxbox-run.sh b/tools-hardened/desktop/fluxbox-run.sh |
| 21 |
index 25fc09d..3d11091 100755 |
| 22 |
--- a/tools-hardened/desktop/fluxbox-run.sh |
| 23 |
+++ b/tools-hardened/desktop/fluxbox-run.sh |
| 24 |
@@ -80,7 +80,7 @@ setup_confs() { |
| 25 |
main() { |
| 26 |
unpack_stage3 |
| 27 |
mount_dirs |
| 28 |
- populate_kernel_src |
| 29 |
+ populate_kernel_src |
| 30 |
populate_etc |
| 31 |
rebuild_toolchain |
| 32 |
rebuild_world |
| 33 |
|
| 34 |
diff --git a/tools-hardened/desktop/gnome3-run.sh b/tools-hardened/desktop/gnome3-run.sh |
| 35 |
index 3bffe0c..1ec109d 100755 |
| 36 |
--- a/tools-hardened/desktop/gnome3-run.sh |
| 37 |
+++ b/tools-hardened/desktop/gnome3-run.sh |
| 38 |
@@ -71,7 +71,7 @@ setup_confs() { |
| 39 |
main() { |
| 40 |
unpack_stage3 |
| 41 |
mount_dirs |
| 42 |
- populate_kernel_src |
| 43 |
+ populate_kernel_src |
| 44 |
populate_etc |
| 45 |
rebuild_toolchain |
| 46 |
rebuild_world |
| 47 |
|
| 48 |
diff --git a/tools-hardened/desktop/run-base.sh b/tools-hardened/desktop/run-base.sh |
| 49 |
index 120f153..4b4b929 100755 |
| 50 |
--- a/tools-hardened/desktop/run-base.sh |
| 51 |
+++ b/tools-hardened/desktop/run-base.sh |
| 52 |
@@ -110,7 +110,7 @@ setup_systemd() { |
| 53 |
chroot "${ROOTFS}"/ systemctl enable gdm.service |
| 54 |
chroot "${ROOTFS}"/ systemctl enable metalog.service |
| 55 |
chroot "${ROOTFS}"/ systemctl enable NetworkManager.service |
| 56 |
- chroot "${ROOTFS}"/ systemctl enable systemd-resolved |
| 57 |
+ chroot "${ROOTFS}"/ systemctl enable systemd-resolved |
| 58 |
chroot "${ROOTFS}"/ systemctl enable postfix.service |
| 59 |
chroot "${ROOTFS}"/ systemctl disable gdm |
| 60 |
chroot "${ROOTFS}"/ systemctl enable slim |
| 61 |
@@ -123,7 +123,7 @@ setup_systemd() { |
| 62 |
|
| 63 |
cleanup_dirs() { |
| 64 |
rm -rf "${ROOTFS}"/tmp/* |
| 65 |
- rm -rf "${ROOTFS}"/usr/src/* |
| 66 |
+ rm -rf "${ROOTFS}"/usr/src/* |
| 67 |
rm -rf "${ROOTFS}"/var/cache/* |
| 68 |
rm -rf "${ROOTFS}"/var/log/* |
| 69 |
rm -rf "${ROOTFS}"/var/tmp/* |
| 70 |
|
| 71 |
diff --git a/tools-hardened/desktop/xfce4-run.sh b/tools-hardened/desktop/xfce4-run.sh |
| 72 |
index 06268aa..9ed5cfd 100755 |
| 73 |
--- a/tools-hardened/desktop/xfce4-run.sh |
| 74 |
+++ b/tools-hardened/desktop/xfce4-run.sh |
| 75 |
@@ -33,7 +33,7 @@ setup_usergroups() { |
| 76 |
|
| 77 |
rm -rf "${ROOTFS}"/home/thuser |
| 78 |
cp -a thuser "${ROOTFS}"/home/thuser |
| 79 |
- sed -i -e 's/^\/usr\/*.*/\/usr\/bin\/startxfce4/' "${ROOTFS}"/home/thuser//.xinitrc |
| 80 |
+ sed -i -e 's/^\/usr\/*.*/\/usr\/bin\/startxfce4/' "${ROOTFS}"/home/thuser//.xinitrc |
| 81 |
cp -a files/{Encrypt,Save,Utilities} "${ROOTFS}"/home/thuser |
| 82 |
rm -rf "${ROOTFS}"/home/thuser/Utilities/post_gnome3_install.sh |
| 83 |
mkdir -p "${ROOTFS}"/home/thuser/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos,.ssh,.cache/dconf,.config/dconf} |
| 84 |
@@ -74,7 +74,7 @@ setup_confs() { |
| 85 |
main() { |
| 86 |
unpack_stage3 |
| 87 |
mount_dirs |
| 88 |
- populate_kernel_src |
| 89 |
+ populate_kernel_src |
| 90 |
populate_etc |
| 91 |
rebuild_toolchain |
| 92 |
rebuild_world |
Archives