diff options
| -rw-r--r-- | etc/inc/gwlb.inc | 6 | ||||
| -rw-r--r-- | etc/pfSense.obsoletedfiles | 1 | ||||
| -rwxr-xr-x | tmp/post_upgrade_command | 51 | ||||
| -rwxr-xr-x | tmp/post_upgrade_command.php | 7 |
4 files changed, 35 insertions, 30 deletions
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc index e32bea0..35fde30 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -214,7 +214,11 @@ EOD; $gwifip = find_interface_ipv6($gateway['interface'], true); } } - + + /* Make sure srcip has scope defined when it's ll */ + if (is_linklocal($gwifip) && !strstr($gwifip, '%')) + $gwifip .= '%' . $gateway['interface']; + if (!is_ipaddrv6($gwifip)) continue; //Skip this target diff --git a/etc/pfSense.obsoletedfiles b/etc/pfSense.obsoletedfiles index 8ff1c87..fe41201 100644 --- a/etc/pfSense.obsoletedfiles +++ b/etc/pfSense.obsoletedfiles @@ -152,3 +152,4 @@ /usr/local/www/javascript/jquery/jquery-ui.custom.css /usr/local/www/javascript/jquery/jquery-ui.custom.min.js /usr/local/www/javascript/jquery.js +/usr/local/sbin/cvs_sync.sh diff --git a/tmp/post_upgrade_command b/tmp/post_upgrade_command index d5577f7..bd4146d 100755 --- a/tmp/post_upgrade_command +++ b/tmp/post_upgrade_command @@ -4,42 +4,47 @@ PFSENSETYPE=`cat /etc/platform` -if [ $PFSENSETYPE = "pfSense" ] || [ $PFSENSETYPE = "nanobsd" ]; then +if [ "${PFSENSETYPE}" = "pfSense" -o "${PFSENSETYPE}" = "nanobsd" ]; then touch /conf/needs_package_sync fi # Detect interactive logins and display the shell detect_command='[ -n "$SSH_TTY" -o "$TERM" = "cons25" ] && exec /etc/rc.initial' -echo "$detect_command" > $CVS_CO_DIR/root/.shrc -echo "$detect_command" >> $CVS_CO_DIR/root/.profile +echo "${detect_command}" > ${CVS_CO_DIR}/root/.shrc +echo "${detect_command}" >> ${CVS_CO_DIR}/root/.profile + +if [ "${PFSENSETYPE}" = "nanobsd" ]; then + ROOT=/tmp/${1}/ +else + ROOT=/ +fi # Now turn on or off serial console as needed -echo "Checking for /tmp/$1/tmp/post_upgrade_command.php... " >> /conf/upgrade_log.txt -if [ -x /tmp/$1/tmp/post_upgrade_command.php ]; then - echo "Running /tmp/$1/tmp/post_upgrade_command.php $1" >> /conf/upgrade_log.txt - /tmp/$1/tmp/post_upgrade_command.php $1 >> /conf/upgrade_log.txt 2>&1 -elif [ -f /tmp/post_upgrade_command.php ]; then - echo "Running /tmp/post_upgrade_command.php $1" >> /conf/upgrade_log.txt - /tmp/post_upgrade_command.php $1 +echo "Checking for ${ROOT}tmp/post_upgrade_command.php... " >> /conf/upgrade_log.txt +if [ -x ${ROOT}tmp/post_upgrade_command.php ]; then + echo "Running ${ROOT}tmp/post_upgrade_command.php $1" >> /conf/upgrade_log.txt + ${ROOT}tmp/post_upgrade_command.php $1 >> /conf/upgrade_log.txt 2>&1 fi # Remove any previous MD5 sum files -rm -f /root/*.md5 - -# File moved to pfSense php shell (pfSsh.php) -rm -rf /usr/local/sbin/cvs_sync.sh +rm -f /root/*.md5 >/dev/null 2>&1 # Fixup permissions on installed files -if [ "${PFSENSETYPE}" = "nanobsd" ]; then - MTREECHKDIR=/tmp/${1}/ -else - MTREECHKDIR=/ +if [ -f ${ROOT}etc/installed_filesystem.mtree ]; then + /usr/sbin/mtree -U -e -q -f ${ROOT}etc/installed_filesystem.mtree -p ${ROOT} > /conf/mtree.log fi -if [ -f ${MTREECHKDIR}etc/installed_filesystem.mtree ]; then - /usr/sbin/mtree -U -e -q -f ${MTREECHKDIR}etc/installed_filesystem.mtree -p ${MTREECHKDIR} > /conf/mtree.log; -fi; # Make sure to preserve existing time zone -if [ "${PFSENSETYPE}" = "nanobsd" ] && [ -f /etc/localtime ]; then - /bin/cp -p /etc/localtime /tmp/${1}/etc/localtime 2>/dev/null +if [ "${PFSENSETYPE}" = "nanobsd" -a -f /etc/localtime ]; then + /bin/cp -p /etc/localtime ${ROOT}etc/localtime 2>/dev/null +fi + +# Obsolete files - nanobsd doesn't need it since a new image is installed +# on the other partition +if [ "${PFSENSETYPE}" != "nanobsd" -a -f /etc/pfSense.obsoletedfiles ]; then + for f in $(cat /etc/pfSense.obsoletedfiles); do + if [ -n "${f}" -a -f "${f}" ]; then + rm -f ${f} + fi + done fi diff --git a/tmp/post_upgrade_command.php b/tmp/post_upgrade_command.php index 5cbc8be..c4a1357 100755 --- a/tmp/post_upgrade_command.php +++ b/tmp/post_upgrade_command.php @@ -1,4 +1,4 @@ -#!/usr/local/bin/php -f +#!/usr/local/bin/php -f <?php /* upgrade embedded users serial console */ @@ -24,10 +24,5 @@ system("echo \"Adding serial port settings ({$newslicedir})...\" >> /conf/upgrade_log.txt"); setup_serial_port("upgrade", $newslicedir); - - $files_to_process = file("/etc/pfSense.obsoletedfiles"); - foreach($files_to_process as $filename) - if(file_exists($filename)) - exec("/bin/rm -f $filename"); ?> |
