d0fbb81a65
9b0a4bafbce7 base-files: tune fragment queue thresholds for available system memory b47094ce96ff include/package-defaults.mk: fix default Build/Prepare with empty ./src 75be005e8bdc include/rootfs.mk: retain list of conffiles with CONFIG_CLEAN_IPKG 696c6325a3a7 include/rootfs.mk: do not remove opkg prerm scripts during rootfs preparation 17c0362178ca base-files: sysupgrade: do not rely on opkg to list changed conffiles 2ae9ebf37402 kernel: bump 4.4 to 4.4.120 for 17.01 571d3def6baf x86: add preinit hook to reload microcode 681aaaf719ec firmware: add microcode package for Intel c6314ee06f94 firmware: add microcode package for AMD 222521d5937a tools: add iucode-tool f7a6b6724a63 x86: enable microcode loading for Intel and AMD dfe620cb93c0 odhcpd: fix interop with wide DHCPv6 client (FS#1377) 18c999a6ff33 base-files: fix off-by-one in counting seconds for factory reset 92ea65b36aa7 sunxi: disable LPAE to allow kernel to run on A13 7dcbe0e22dbb bcm53xx: fix fallback code for picking status LED 4db583b9c2ab mountd: update to the latest version from 2018-02-26
259 lines
7.6 KiB
Diff
259 lines
7.6 KiB
Diff
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
Date: Sun, 23 Apr 2017 23:33:14 +0200
|
|
Subject: base-files: sysupgrade cleanup
|
|
|
|
Some functions only used by stage2 are moved there from common.sh.
|
|
|
|
One piece that could still use more cleanup is platform_pre_upgrade: many
|
|
targets reference files from there are aren't available in the ramfs, so
|
|
we need to evaluate it before the switch; conversely, flash writes happen
|
|
in that function on some targets. Targets that do the latter should be
|
|
fixed eventually to use platform_do_upgrade for that purpose.
|
|
|
|
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
|
|
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
|
|
index ef9aac709fc1619ba15eeb0aeb4a9a6a372369b2..af7682c29e005c6ca47b91e9be2d60c359a90d05 100644
|
|
--- a/package/base-files/files/lib/upgrade/common.sh
|
|
+++ b/package/base-files/files/lib/upgrade/common.sh
|
|
@@ -30,106 +30,6 @@ install_bin() { # <file> [ <symlink> ... ]
|
|
}; done
|
|
}
|
|
|
|
-supivot() { # <new_root> <old_root>
|
|
- /bin/mount | grep "on $1 type" 2>&- 1>&- || /bin/mount -o bind $1 $1
|
|
- mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \
|
|
- /bin/mount -o noatime,move /proc $1/proc && \
|
|
- pivot_root $1 $1$2 || {
|
|
- /bin/umount -l $1 $1
|
|
- return 1
|
|
- }
|
|
-
|
|
- /bin/mount -o noatime,move $2/sys /sys
|
|
- /bin/mount -o noatime,move $2/dev /dev
|
|
- /bin/mount -o noatime,move $2/tmp /tmp
|
|
- /bin/mount -o noatime,move $2/overlay /overlay 2>&-
|
|
- return 0
|
|
-}
|
|
-
|
|
-run_ramfs() { # <command> [...]
|
|
- install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount \
|
|
- /sbin/pivot_root /sbin/reboot /bin/sync /bin/dd /bin/grep \
|
|
- /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/dd \
|
|
- /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump \
|
|
- /bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
|
|
- /bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir \
|
|
- /bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
|
|
- /bin/mknod
|
|
-
|
|
- install_bin /sbin/mtd
|
|
- install_bin /sbin/mount_root
|
|
- install_bin /sbin/snapshot
|
|
- install_bin /sbin/snapshot_tool
|
|
- install_bin /usr/sbin/ubiupdatevol
|
|
- install_bin /usr/sbin/ubiattach
|
|
- install_bin /usr/sbin/ubiblock
|
|
- install_bin /usr/sbin/ubiformat
|
|
- install_bin /usr/sbin/ubidetach
|
|
- install_bin /usr/sbin/ubirsvol
|
|
- install_bin /usr/sbin/ubirmvol
|
|
- install_bin /usr/sbin/ubimkvol
|
|
- install_bin /usr/sbin/partx
|
|
- install_bin /usr/sbin/losetup
|
|
- install_bin /usr/sbin/mkfs.ext4
|
|
- for file in $RAMFS_COPY_BIN; do
|
|
- install_bin ${file//:/ }
|
|
- done
|
|
- install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA
|
|
-
|
|
- [ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64
|
|
-
|
|
- supivot $RAM_ROOT /mnt || {
|
|
- echo "Failed to switch over to ramfs. Please reboot."
|
|
- exit 1
|
|
- }
|
|
-
|
|
- /bin/mount -o remount,ro /mnt
|
|
- /bin/umount -l /mnt
|
|
-
|
|
- grep /overlay /proc/mounts > /dev/null && {
|
|
- /bin/mount -o noatime,remount,ro /overlay
|
|
- /bin/umount -l /overlay
|
|
- }
|
|
-
|
|
- # spawn a new shell from ramdisk to reduce the probability of cache issues
|
|
- exec /bin/busybox ash -c "$*"
|
|
-}
|
|
-
|
|
-kill_remaining() { # [ <signal> [ <loop> ] ]
|
|
- local sig="${1:-TERM}"
|
|
- local loop="${2:-0}"
|
|
- local run=true
|
|
- local stat
|
|
-
|
|
- echo -n "Sending $sig to remaining processes ... "
|
|
-
|
|
- while $run; do
|
|
- run=false
|
|
- for stat in /proc/[0-9]*/stat; do
|
|
- [ -f "$stat" ] || continue
|
|
-
|
|
- local pid name state ppid rest
|
|
- read pid name state ppid rest < $stat
|
|
- name="${name#(}"; name="${name%)}"
|
|
-
|
|
- # Skip PID1, ourself and our children
|
|
- [ $pid -ne 1 -a $pid -ne $$ -a $ppid -ne $$ ] || continue
|
|
-
|
|
- local cmdline
|
|
- read cmdline < /proc/$pid/cmdline
|
|
-
|
|
- # Skip kernel threads
|
|
- [ -n "$cmdline" ] || continue
|
|
-
|
|
- echo -n "$name "
|
|
- kill -$sig $pid 2>/dev/null
|
|
-
|
|
- [ $loop -eq 1 ] && run=true
|
|
- done
|
|
- done
|
|
- echo ""
|
|
-}
|
|
-
|
|
run_hooks() {
|
|
local arg="$1"; shift
|
|
for func in "$@"; do
|
|
diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
|
|
index 4e2aa3a23c3bab07a795762a30a4d4f701081934..cc8047d988e39ca9ba27d2588744aad469d1d978 100755
|
|
--- a/package/base-files/files/lib/upgrade/stage2
|
|
+++ b/package/base-files/files/lib/upgrade/stage2
|
|
@@ -24,6 +24,104 @@ export CONF_TAR=/tmp/sysupgrade.tgz
|
|
include /lib/upgrade
|
|
|
|
|
|
+supivot() { # <new_root> <old_root>
|
|
+ /bin/mount | grep "on $1 type" 2>&- 1>&- || /bin/mount -o bind $1 $1
|
|
+ mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \
|
|
+ /bin/mount -o noatime,move /proc $1/proc && \
|
|
+ pivot_root $1 $1$2 || {
|
|
+ /bin/umount -l $1 $1
|
|
+ return 1
|
|
+ }
|
|
+
|
|
+ /bin/mount -o noatime,move $2/sys /sys
|
|
+ /bin/mount -o noatime,move $2/dev /dev
|
|
+ /bin/mount -o noatime,move $2/tmp /tmp
|
|
+ /bin/mount -o noatime,move $2/overlay /overlay 2>&-
|
|
+ return 0
|
|
+}
|
|
+
|
|
+switch_to_ramfs() {
|
|
+ install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount \
|
|
+ /sbin/pivot_root /sbin/reboot /bin/sync /bin/dd /bin/grep \
|
|
+ /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/dd \
|
|
+ /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump \
|
|
+ /bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
|
|
+ /bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir \
|
|
+ /bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
|
|
+ /bin/mknod
|
|
+
|
|
+ install_bin /sbin/mtd
|
|
+ install_bin /sbin/mount_root
|
|
+ install_bin /sbin/snapshot
|
|
+ install_bin /sbin/snapshot_tool
|
|
+ install_bin /usr/sbin/ubiupdatevol
|
|
+ install_bin /usr/sbin/ubiattach
|
|
+ install_bin /usr/sbin/ubiblock
|
|
+ install_bin /usr/sbin/ubiformat
|
|
+ install_bin /usr/sbin/ubidetach
|
|
+ install_bin /usr/sbin/ubirsvol
|
|
+ install_bin /usr/sbin/ubirmvol
|
|
+ install_bin /usr/sbin/ubimkvol
|
|
+ install_bin /usr/sbin/partx
|
|
+ install_bin /usr/sbin/losetup
|
|
+ install_bin /usr/sbin/mkfs.ext4
|
|
+ for file in $RAMFS_COPY_BIN; do
|
|
+ install_bin ${file//:/ }
|
|
+ done
|
|
+ install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA
|
|
+
|
|
+ [ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64
|
|
+
|
|
+ supivot $RAM_ROOT /mnt || {
|
|
+ echo "Failed to switch over to ramfs. Please reboot."
|
|
+ exit 1
|
|
+ }
|
|
+
|
|
+ /bin/mount -o remount,ro /mnt
|
|
+ /bin/umount -l /mnt
|
|
+
|
|
+ grep /overlay /proc/mounts > /dev/null && {
|
|
+ /bin/mount -o noatime,remount,ro /overlay
|
|
+ /bin/umount -l /overlay
|
|
+ }
|
|
+}
|
|
+
|
|
+kill_remaining() { # [ <signal> [ <loop> ] ]
|
|
+ local sig="${1:-TERM}"
|
|
+ local loop="${2:-0}"
|
|
+ local run=true
|
|
+ local stat
|
|
+
|
|
+ echo -n "Sending $sig to remaining processes ... "
|
|
+
|
|
+ while $run; do
|
|
+ run=false
|
|
+ for stat in /proc/[0-9]*/stat; do
|
|
+ [ -f "$stat" ] || continue
|
|
+
|
|
+ local pid name state ppid rest
|
|
+ read pid name state ppid rest < $stat
|
|
+ name="${name#(}"; name="${name%)}"
|
|
+
|
|
+ # Skip PID1, ourself and our children
|
|
+ [ $pid -ne 1 -a $pid -ne $$ -a $ppid -ne $$ ] || continue
|
|
+
|
|
+ local cmdline
|
|
+ read cmdline < /proc/$pid/cmdline
|
|
+
|
|
+ # Skip kernel threads
|
|
+ [ -n "$cmdline" ] || continue
|
|
+
|
|
+ echo -n "$name "
|
|
+ kill -$sig $pid 2>/dev/null
|
|
+
|
|
+ [ $loop -eq 1 ] && run=true
|
|
+ done
|
|
+ done
|
|
+ echo ""
|
|
+}
|
|
+
|
|
+
|
|
killall -9 telnetd
|
|
killall -9 dropbear
|
|
killall -9 ash
|
|
@@ -44,7 +142,8 @@ fi
|
|
|
|
if [ -n "$(rootfs_type)" ]; then
|
|
echo "Switching to ramdisk..."
|
|
- run_ramfs "$COMMAND"
|
|
-else
|
|
- exec /bin/busybox ash -c "$COMMAND"
|
|
+ switch_to_ramfs
|
|
fi
|
|
+
|
|
+# Exec new shell from ramfs
|
|
+exec /bin/busybox ash -c "$COMMAND"
|
|
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
|
|
index fa08f4194daa0ee74758b9f49a23fe8dcb4b933d..347860d00af27a61152703320bb210d30726db83 100755
|
|
--- a/package/base-files/files/sbin/sysupgrade
|
|
+++ b/package/base-files/files/sbin/sysupgrade
|
|
@@ -1,7 +1,5 @@
|
|
#!/bin/sh
|
|
|
|
-[ "$1" = "nand" ] && exec /lib/upgrade/stage2 "$2" "$3"
|
|
-
|
|
. /lib/functions.sh
|
|
. /lib/functions/system.sh
|
|
|