pentoo-system: again, quickly modify to deal with non-root users

This commit is contained in:
Zero_Chaos 2014-09-07 04:20:37 +00:00
parent 2148b42ba8
commit fd65ac10f6
2 changed files with 16 additions and 1 deletions

View file

@ -8,6 +8,6 @@ AUX layman-sync 56 SHA256 3d8376566a509d4cfdcee8df55bdaf48fcdaf62c4dd46649c8bf33
AUX local.conf 524 SHA256 f0854a36ace98318a20772448aae5e5d465eba5d1f1517292a86a5f2b46c55d8 SHA512 b3f4f7590b532e8db7db5586dad6c54cd5ce2e040b16bbfa8a3fa74445028b3411cf087b254b71866ea12d42c7f8740cfbfe64e269a8675a729315b9415546d9 WHIRLPOOL 8a7322d2593e3f3a4cfeea2af1ed9f0a226af5e8037808b49e195fe2210d35f8a314a962215507f0bde303d601afb917a3f0fc7fd181be2d7a34f958de9bd3c2
AUX motd-2014.3-r6 2659 SHA256 1190f599562d06d3b3f24f7a9ca865b18d279d428620753544c9d39928aa9f07 SHA512 5e15c3ecd4756774b1e0b283e564bb1d00338261cf7c8374112a940a091c73879df7c35f8b5fd03c8464dc58739c0d2735e007208e95c77ddedbe9f115ecc5b3 WHIRLPOOL 9d2992d9e207b5699b9b8027d938dce9a6c4cc4f6085f0ceb8bbe91999351cb8601cff5339b3a0fb249655ebc048339473f590168353ce193cd8cb18e39c1b14
AUX pentoo.xpm.gz 59047 SHA256 4adb6d0d305b599e35bed9a835b6aa3531cce71c0b05e293adb3197cac4c09e0 SHA512 a6a2f152861e63c33afdda9997b9be25bd735f0624c946d61d0088210264743f842f103026eeb7cf63ef94b873131b072b61c55fba1922e9830318bcacd7a074 WHIRLPOOL a3b937b810f02f1fa6ebcdc58cada7a71e778f370b3355a08670a7f524d8e370ba29bdaf408d0bdd14753a129734d80a952937f3e009a69e87bed90995a2aaaf
AUX toggle_hardened 1186 SHA256 898784edf3a3439820bd8f7a8e08f1d085406cfa56440d32bb1b2002c9e5ed4f SHA512 db8a375ad4e2f42b427f76536d1e2bee5770cc47c31dbaa0d2645fde660fec81ab6120ba0151eb039ab8fb25c56fce1793aaf3a9246c90a5df9973b1fc588f86 WHIRLPOOL 6d9248c3319ebea3cee7211a4fe2b70c8eaab86b62dc120c30e5da99d7b08c6503e5322c0ea83c5e5cae90f86c863976ee08871f3660f852952ab46cb8774272
AUX toggle_hardened 1525 SHA256 4149a0ec42cd348eef7c707d33c792fc1673071c47e13f6d287719b6f84aec8b SHA512 8bd848c38f86c544eaf171a7b1492d837971aa252f58a14a37c6372019741036b1d66417585a685630637fa61b1ad6da50df46b8ad330396682e0b877336d451 WHIRLPOOL 42b32c6d72591ebc86e230dc36b9c16024c3f85f5c9397ed8efbc70b5bad446f2e79585fa114b160a0d683121e1b221a6c6e9a78732bb6d91d39b316b342834d
AUX toggle_hardened.desktop 195 SHA256 6f210f31e26e30509c1bfe1b3fb2c5a5ddc208298f40649a3e1b98fd8cbbaaa0 SHA512 d92bfcc736e44ed41eb12d7698a6acb7bd1a7cf8369fbcd9a0eba256bcf4eeb3b6a05f0a7a765ca10c39d7feaf115dfd8a7d8aba3dd097a9a9b450016d236add WHIRLPOOL fceeb44da7b225ef17b578474d7860398fe4c5a5e21bba200f6e7814b71c716dc55a43a062ebaf2f842993de2f2fa52e7904062eef5d2eca281151fecba310f5
EBUILD pentoo-system-2014.3-r6.ebuild 5811 SHA256 b42a934f692024b065cc7f4a6026a102f0ba7cd0e226dfa561716365ae0daa2f SHA512 3a438a34f60892c96cfeed7f6fca7ccda72acd825ab435873a98827330ea220b06de426547c69f0ac39b64cfb6f560fd1d5df8bf36eadfada8f829e029f9196a WHIRLPOOL 53d08c2827978c5fcabf80bdddd10afd90a5587c95d224d0d85b573398cc88a6ad3ad77229520b43bfe4e83c340dc592e292c531fbc3347d85fefb305129db44

View file

@ -10,6 +10,21 @@ else
dialog=dialog
fi
if [ x"$(command -v id 2> /dev/null)" != "x" ]
then
USERID="$(id -u 2> /dev/null)"
fi
if [ x${USERID} = "x" -a x${UID} != "x" ]
then
USERID=${UID}
fi
if [ x${USERID} != "x" -a x${USERID} != "x0" ]
then
${dialog} --aspect 15 --msgbox "Only root can modify PaX, please try 'sudo toggle_hardened' on the command line." 0 0 && exit 1
fi
if [ "$(cat /proc/sys/kernel/pax/softmode)" = "1" ]; then
${dialog} --aspect 15 --yesno "PaX softmode is currently on, would you like to re-enable hardening?" 0 0 \