From 272a5b8b412e6c09821a2baaa1d24363faafaa29 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 19 May 2018 15:23:36 +0200 Subject: [PATCH] rc: rc.initital is now opnsense-shell --- +POST_INSTALL | 6 ++--- +PRE_DEINSTALL | 2 +- plist | 22 +++++++++---------- src/etc/inc/auth.inc | 4 ++-- src/etc/rc | 2 +- src/etc/rc.subr.d/recover | 2 +- .../scripts/shell/banner.php} | 0 .../scripts/shell/defaults.php} | 0 .../scripts/shell/firmware.sh} | 0 .../scripts/shell/halt.php} | 0 .../scripts/shell/password.php} | 0 .../scripts/shell/ping.php} | 0 .../scripts/shell/reboot.php} | 0 .../scripts/shell/restore.sh} | 0 .../scripts/shell/setaddr.php} | 0 .../scripts/shell/setports.php} | 0 src/{etc/rc.initial => sbin/opnsense-shell} | 20 ++++++++--------- 17 files changed, 29 insertions(+), 29 deletions(-) rename src/{etc/rc.initial.banner => opnsense/scripts/shell/banner.php} (100%) rename src/{etc/rc.initial.defaults => opnsense/scripts/shell/defaults.php} (100%) rename src/{etc/rc.initial.firmware => opnsense/scripts/shell/firmware.sh} (100%) rename src/{etc/rc.initial.halt => opnsense/scripts/shell/halt.php} (100%) rename src/{etc/rc.initial.password => opnsense/scripts/shell/password.php} (100%) rename src/{etc/rc.initial.ping => opnsense/scripts/shell/ping.php} (100%) rename src/{etc/rc.initial.reboot => opnsense/scripts/shell/reboot.php} (100%) rename src/{etc/rc.initial.restore => opnsense/scripts/shell/restore.sh} (100%) rename src/{etc/rc.initial.setlanip => opnsense/scripts/shell/setaddr.php} (100%) rename src/{etc/rc.initial.setports => opnsense/scripts/shell/setports.php} (100%) rename src/{etc/rc.initial => sbin/opnsense-shell} (82%) diff --git a/+POST_INSTALL b/+POST_INSTALL index a7341ca5b..1a927dfb7 100644 --- a/+POST_INSTALL +++ b/+POST_INSTALL @@ -1,7 +1,7 @@ echo "Updating /etc/shells" cp /etc/shells /etc/shells.bak -(grep -v /usr/local/etc/rc.initial /etc/shells.bak; \ - echo /usr/local/etc/rc.initial) > /etc/shells +(grep -v /usr/local/sbin/opnsense-shell /etc/shells.bak; \ + echo /usr/local/sbin/opnsense-shell) > /etc/shells rm -f /etc/shells.bak cp /etc/shells /etc/shells.bak (grep -v /usr/local/sbin/opnsense-installer /etc/shells.bak; \ @@ -9,7 +9,7 @@ cp /etc/shells /etc/shells.bak rm -f /etc/shells.bak echo "Registering root shell" -pw usermod -n root -s /usr/local/etc/rc.initial +pw usermod -n root -s /usr/local/sbin/opnsense-shell echo "Hooking into /etc/rc" cp /etc/rc /etc/rc.bak diff --git a/+PRE_DEINSTALL b/+PRE_DEINSTALL index ce40b8862..71483468a 100644 --- a/+PRE_DEINSTALL +++ b/+PRE_DEINSTALL @@ -5,7 +5,7 @@ pw usermod -n root -s /bin/csh echo "Updating /etc/shells" cp /etc/shells /etc/shells.bak -(grep -v /usr/local/etc/rc.initial /etc/shells.bak) > /etc/shells +(grep -v /usr/local/sbin/opnsense-shell /etc/shells.bak) > /etc/shells rm -f /etc/shells.bak cp /etc/shells /etc/shells.bak (grep -v /usr/local/sbin/opnsense-installer /etc/shells.bak) > /etc/shells diff --git a/plist b/plist index 38edc18ca..0eee5c861 100644 --- a/plist +++ b/plist @@ -96,17 +96,6 @@ /usr/local/etc/rc.firmware.subr /usr/local/etc/rc.freebsd /usr/local/etc/rc.halt -/usr/local/etc/rc.initial -/usr/local/etc/rc.initial.banner -/usr/local/etc/rc.initial.defaults -/usr/local/etc/rc.initial.firmware -/usr/local/etc/rc.initial.halt -/usr/local/etc/rc.initial.password -/usr/local/etc/rc.initial.ping -/usr/local/etc/rc.initial.reboot -/usr/local/etc/rc.initial.restore -/usr/local/etc/rc.initial.setlanip -/usr/local/etc/rc.initial.setports /usr/local/etc/rc.interfaces_wan_configure /usr/local/etc/rc.ipfw /usr/local/etc/rc.ipfw.flush_all @@ -680,6 +669,16 @@ /usr/local/opnsense/scripts/remote_backup.php /usr/local/opnsense/scripts/routes/gateways.php /usr/local/opnsense/scripts/routes/show_routes.py +/usr/local/opnsense/scripts/shell/banner.php +/usr/local/opnsense/scripts/shell/defaults.php +/usr/local/opnsense/scripts/shell/firmware.sh +/usr/local/opnsense/scripts/shell/halt.php +/usr/local/opnsense/scripts/shell/password.php +/usr/local/opnsense/scripts/shell/ping.php +/usr/local/opnsense/scripts/shell/reboot.php +/usr/local/opnsense/scripts/shell/restore.sh +/usr/local/opnsense/scripts/shell/setaddr.php +/usr/local/opnsense/scripts/shell/setports.php /usr/local/opnsense/scripts/suricata/__init__.py /usr/local/opnsense/scripts/suricata/dropAlertLog.py /usr/local/opnsense/scripts/suricata/installRules.py @@ -995,6 +994,7 @@ /usr/local/sbin/opnsense-auth /usr/local/sbin/opnsense-importer /usr/local/sbin/opnsense-installer +/usr/local/sbin/opnsense-shell /usr/local/sbin/ping_hosts.sh /usr/local/sbin/pluginctl /usr/local/sbin/ppp-linkdown diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index adf104ff3..0b3ffff63 100644 --- a/src/etc/inc/auth.inc +++ b/src/etc/inc/auth.inc @@ -361,7 +361,7 @@ function auth_get_shells($uid = 0) $shells = array('' => '/sbin/nologin'); if ($uid == 0) { - $shells = array('' => '/usr/local/etc/rc.initial'); + $shells = array('' => '/usr/local/sbin/opnsense-shell'); } $etc_shells = @file_get_contents('/etc/shells'); @@ -451,7 +451,7 @@ function local_user_set(&$user, $force_password = false) $lock_account = 'lock'; if ($user_uid == 0) { - $user_shell = isset($user['shell']) ? $user['shell'] : '/usr/local/etc/rc.initial'; + $user_shell = isset($user['shell']) ? $user['shell'] : '/usr/local/sbin/opnsense-shell'; $user_group = 'wheel'; $user_home = '/root'; } else { diff --git a/src/etc/rc b/src/etc/rc index 304a86991..b9d61c463 100755 --- a/src/etc/rc +++ b/src/etc/rc @@ -200,7 +200,7 @@ rm /var/run/booting echo -n "Root file system: " mount | grep ' on / ' | awk '{ print $1 }' -/usr/local/etc/rc.initial.banner +/usr/local/opnsense/scripts/shell/banner.php /usr/local/etc/rc.subr.d/livemode exit 0 diff --git a/src/etc/rc.subr.d/recover b/src/etc/rc.subr.d/recover index 5713c8eb4..1a0dec2ec 100755 --- a/src/etc/rc.subr.d/recover +++ b/src/etc/rc.subr.d/recover @@ -116,8 +116,8 @@ $known_shells = array( '/usr/local/bin/bash', '/usr/local/bin/scponly', '/usr/local/bin/zsh', - '/usr/local/etc/rc.initial', '/usr/local/sbin/opnsense-installer', + '/usr/local/sbin/opnsense-shell', ); foreach ($known_shells as $shell) { diff --git a/src/etc/rc.initial.banner b/src/opnsense/scripts/shell/banner.php similarity index 100% rename from src/etc/rc.initial.banner rename to src/opnsense/scripts/shell/banner.php diff --git a/src/etc/rc.initial.defaults b/src/opnsense/scripts/shell/defaults.php similarity index 100% rename from src/etc/rc.initial.defaults rename to src/opnsense/scripts/shell/defaults.php diff --git a/src/etc/rc.initial.firmware b/src/opnsense/scripts/shell/firmware.sh similarity index 100% rename from src/etc/rc.initial.firmware rename to src/opnsense/scripts/shell/firmware.sh diff --git a/src/etc/rc.initial.halt b/src/opnsense/scripts/shell/halt.php similarity index 100% rename from src/etc/rc.initial.halt rename to src/opnsense/scripts/shell/halt.php diff --git a/src/etc/rc.initial.password b/src/opnsense/scripts/shell/password.php similarity index 100% rename from src/etc/rc.initial.password rename to src/opnsense/scripts/shell/password.php diff --git a/src/etc/rc.initial.ping b/src/opnsense/scripts/shell/ping.php similarity index 100% rename from src/etc/rc.initial.ping rename to src/opnsense/scripts/shell/ping.php diff --git a/src/etc/rc.initial.reboot b/src/opnsense/scripts/shell/reboot.php similarity index 100% rename from src/etc/rc.initial.reboot rename to src/opnsense/scripts/shell/reboot.php diff --git a/src/etc/rc.initial.restore b/src/opnsense/scripts/shell/restore.sh similarity index 100% rename from src/etc/rc.initial.restore rename to src/opnsense/scripts/shell/restore.sh diff --git a/src/etc/rc.initial.setlanip b/src/opnsense/scripts/shell/setaddr.php similarity index 100% rename from src/etc/rc.initial.setlanip rename to src/opnsense/scripts/shell/setaddr.php diff --git a/src/etc/rc.initial.setports b/src/opnsense/scripts/shell/setports.php similarity index 100% rename from src/etc/rc.initial.setports rename to src/opnsense/scripts/shell/setports.php diff --git a/src/etc/rc.initial b/src/sbin/opnsense-shell similarity index 82% rename from src/etc/rc.initial rename to src/sbin/opnsense-shell index 53f723085..8e5ed50d0 100755 --- a/src/etc/rc.initial +++ b/src/sbin/opnsense-shell @@ -63,25 +63,25 @@ case ${OPCODE} in exit ;; 1) - /usr/local/etc/rc.initial.setports + /usr/local/opnsense/scripts/shell/setports.php ;; 2) - /usr/local/etc/rc.initial.setlanip + /usr/local/opnsense/scripts/shell/setaddr.php ;; 3) - /usr/local/etc/rc.initial.password + /usr/local/opnsense/scripts/shell/password.php ;; 4) - /usr/local/etc/rc.initial.defaults + /usr/local/opnsense/scripts/shell/defaults.php ;; 5) - /usr/local/etc/rc.initial.halt + /usr/local/opnsense/scripts/shell/halt.php ;; 6) - /usr/local/etc/rc.initial.reboot + /usr/local/opnsense/scripts/shell/reboot.php ;; 7) - /usr/local/etc/rc.initial.ping + /usr/local/opnsense/scripts/shell/ping.php ;; 8) /bin/csh @@ -96,15 +96,15 @@ case ${OPCODE} in /usr/local/etc/rc.reload_all ;; 12) - /usr/local/etc/rc.initial.firmware + /usr/local/opnsense/scripts/shell/firmware.sh ;; 13) - /usr/local/etc/rc.initial.restore + /usr/local/opnsense/scripts/shell/restore.sh ;; *) ;; esac -/usr/local/etc/rc.initial.banner +/usr/local/opnsense/scripts/shell/banner.php done