From 438dfe5c6fbfa63f5841fda9b4ec44b2f7712674 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sat, 29 Sep 2007 14:27:54 +0000 Subject: get rid of per-profile base-files SVN-Revision: 9069 --- .../linux/x86/base-files/default/etc/preinit.arch | 2 -- .../x86/base-files/default/lib/upgrade/platform.sh | 27 ---------------------- target/linux/x86/base-files/etc/preinit.arch | 2 ++ .../linux/x86/base-files/lib/upgrade/platform.sh | 27 ++++++++++++++++++++++ 4 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 target/linux/x86/base-files/default/etc/preinit.arch delete mode 100644 target/linux/x86/base-files/default/lib/upgrade/platform.sh create mode 100644 target/linux/x86/base-files/etc/preinit.arch create mode 100644 target/linux/x86/base-files/lib/upgrade/platform.sh (limited to 'target/linux/x86/base-files') diff --git a/target/linux/x86/base-files/default/etc/preinit.arch b/target/linux/x86/base-files/default/etc/preinit.arch deleted file mode 100644 index f29f0d448b..0000000000 --- a/target/linux/x86/base-files/default/etc/preinit.arch +++ /dev/null @@ -1,2 +0,0 @@ -mount -t proc none /proc -grep 'failsafe=' /proc/cmdline && export FAILSAFE=true diff --git a/target/linux/x86/base-files/default/lib/upgrade/platform.sh b/target/linux/x86/base-files/default/lib/upgrade/platform.sh deleted file mode 100644 index ffd0b93ab4..0000000000 --- a/target/linux/x86/base-files/default/lib/upgrade/platform.sh +++ /dev/null @@ -1,27 +0,0 @@ -platform_check_image() { - [ "$ARGC" -gt 1 ] && return 1 - - case "$(get_magic_word "$1")" in - 48eb) return 0;; - *) - echo "Invalid image type" - return 1 - ;; - esac -} - -platform_do_upgrade() { - get_image "$1" > /dev/hda - sync -} - -x86_prepare_ext2() { - # if we're running from ext2, we need to make sure that we have a mtd - # partition that points to the active rootfs partition. - # however this only matters if we actually need to preserve the config files - [ "$SAVE_CONFIG" -eq 1 ] && return 0 - grep rootfs /proc/mtd >/dev/null || { - echo /dev/hda2,65536,rootfs > /sys/module/block2mtd/parameters/block2mtd - } -} -append sysupgrade_pre_upgrade x86_prepare_ext2 diff --git a/target/linux/x86/base-files/etc/preinit.arch b/target/linux/x86/base-files/etc/preinit.arch new file mode 100644 index 0000000000..f29f0d448b --- /dev/null +++ b/target/linux/x86/base-files/etc/preinit.arch @@ -0,0 +1,2 @@ +mount -t proc none /proc +grep 'failsafe=' /proc/cmdline && export FAILSAFE=true diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh new file mode 100644 index 0000000000..ffd0b93ab4 --- /dev/null +++ b/target/linux/x86/base-files/lib/upgrade/platform.sh @@ -0,0 +1,27 @@ +platform_check_image() { + [ "$ARGC" -gt 1 ] && return 1 + + case "$(get_magic_word "$1")" in + 48eb) return 0;; + *) + echo "Invalid image type" + return 1 + ;; + esac +} + +platform_do_upgrade() { + get_image "$1" > /dev/hda + sync +} + +x86_prepare_ext2() { + # if we're running from ext2, we need to make sure that we have a mtd + # partition that points to the active rootfs partition. + # however this only matters if we actually need to preserve the config files + [ "$SAVE_CONFIG" -eq 1 ] && return 0 + grep rootfs /proc/mtd >/dev/null || { + echo /dev/hda2,65536,rootfs > /sys/module/block2mtd/parameters/block2mtd + } +} +append sysupgrade_pre_upgrade x86_prepare_ext2 -- cgit v1.2.3