diff --git a/pentoo/pentoo-system/files/b43-commercial-2012.1 b/pentoo/pentoo-system/files/b43-commercial-2016.3 similarity index 69% rename from pentoo/pentoo-system/files/b43-commercial-2012.1 rename to pentoo/pentoo-system/files/b43-commercial-2016.3 index b3cfff485..93090bf46 100755 --- a/pentoo/pentoo-system/files/b43-commercial-2012.1 +++ b/pentoo/pentoo-system/files/b43-commercial-2016.3 @@ -1,5 +1,9 @@ #!/bin/bash -emerge broadcom-firmware-installer +if [ "${EUID}" = "0" ]; then + emerge broadcom-firmware-installer +else + sudo emerge broadcom-firmware-installer +fi echo "You can make a module for your personal use and put it in the modules" echo "folder of your usb/cd for personal use only." echo "To do this run \"makemo broadcom-firmware-installer\"." diff --git a/pentoo/pentoo-system/files/motd-2015.4 b/pentoo/pentoo-system/files/motd-2016.3 similarity index 66% rename from pentoo/pentoo-system/files/motd-2015.4 rename to pentoo/pentoo-system/files/motd-2016.3 index 9667185eb..cc056f596 100644 --- a/pentoo/pentoo-system/files/motd-2015.4 +++ b/pentoo/pentoo-system/files/motd-2016.3 @@ -12,24 +12,25 @@ Welcome to Pentoo powered by Gentoo linux...  -**************************************************************************** -* * -*  All network interfaces are now down at boot. * -*  For gui network manager, type "/etc/init.d/NetworkManager start" * -*  Or you can type dhcpcd ethX to setup your network interface. * -*  If you have a broadcom wifi card it is currently using b43-openfwwf. * -*  If this is undesirable or non-functional type "./b43-commercial" * -*  You can toggle PaX hardening on and off with "toggle_hardened" * -* * -*  If you are running live usb there are many ways to save changes: * -*  You can run "flushchanges" to automatically save any current changes. * -*  You can run "makemo category/package" to add a new package * -*  which will be available now and after reboot. * -* * -*  Pentoo Bug Tracker https://github.com/pentoo/pentoo-overlay/issues * -*  Update using "pentoo-updater" command. * -* * -*  Type startx to launch XFCE window manager * -*  enlightenment e17 is also installed but not ready for general use yet * -* * -**************************************************************************** +***************************************************************************** +* * +*  All network interfaces are now down at boot. * +*  For gui network manager, type "/etc/init.d/NetworkManager start" as root * +*  Or you can type "dhcpcd ethX" as root to setup your network interface. * +*  If you have a broadcom wifi card it is currently using b43-openfwwf. * +*  If this is undesirable or non-functional type "./b43-commercial" * +*  You can toggle PaX hardening on and off with "toggle_hardened" as root * +* * +*  If you are running live usb there are many ways to save changes: * +*  You can run "flushchanges" as root to automatically save any ^[[1;31;30m* +* ^[[1;31;37m changes made since boot. * +*  You can run "makemo category/package" as root to install a new package * +*  which will be available now and after reboot. * +* * +*  Pentoo Bug Tracker https://github.com/pentoo/pentoo-overlay/issues * +*  Update using "pentoo-updater" command as root. * +* * +*  Type startx to launch XFCE window manager * +*  enlightenment e17 is also installed but not ready for general use yet * +* * +***************************************************************************** diff --git a/pentoo/pentoo-system/files/sudo_toggle_hardened.desktop b/pentoo/pentoo-system/files/sudo_toggle_hardened.desktop new file mode 100644 index 000000000..beb1e027f --- /dev/null +++ b/pentoo/pentoo-system/files/sudo_toggle_hardened.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=toggle_hardened +Comment={En,Dis}able PaX softmode +Exec=/usr/sbin/toggle_hardened +Icon=changes-allow +Path=/tmp +Terminal=false +StartupNotify=false diff --git a/pentoo/pentoo-system/pentoo-system-2016.3-r1.ebuild b/pentoo/pentoo-system/pentoo-system-2016.3-r2.ebuild similarity index 95% rename from pentoo/pentoo-system/pentoo-system-2016.3-r1.ebuild rename to pentoo/pentoo-system/pentoo-system-2016.3-r2.ebuild index 11c8c9c33..ba3caa6a5 100644 --- a/pentoo/pentoo-system/pentoo-system-2016.3-r1.ebuild +++ b/pentoo/pentoo-system/pentoo-system-2016.3-r2.ebuild @@ -130,11 +130,15 @@ src_install() { dosbin "${FILESDIR}"/toggle_hardened exeinto /root/Desktop/ doexe "${FILESDIR}"/toggle_hardened.desktop + exeinto /etc/skel/Desktop/ + newexe "${FILESDIR}"/sudo_toggle_hardened.desktop toggle_hardened.desktop fi ##here is where we merge in things from root_overlay which make sense exeinto /root - newexe "${FILESDIR}"/b43-commercial-2012.1 b43-commercial + newexe "${FILESDIR}"/b43-commercial-2016.3 b43-commercial + execinto /etc/skel + newexe "${FILESDIR}"/b43-commercial-2016.3 b43-commercial #/usr/bin use enlightenment && newbin "${FILESDIR}"/dokeybindings-2012.1 dokeybindings @@ -143,7 +147,7 @@ src_install() { insinto /etc echo "Pentoo Release ${PV}" > pentoo-release doins pentoo-release - newins "${FILESDIR}"/motd-2015.4 motd + newins "${FILESDIR}"/motd-2016.3 motd dodir /etc/env.d use kde && echo 'XSESSION="KDE-4"' > "${ED}"/etc/env.d/90xsession