diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-29 04:32:01 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-29 04:32:01 +0000 |
| commit | 795063e4bd943a6f8b10d4ed11ddce8aad604771 (patch) | |
| tree | bd27c2604891a5f0871e47c5a5027278ce4b9029 /target/linux/x86_64/base-files | |
| parent | a12f75fc15f858afc69fcf64d8bc8fc526bc7fdc (diff) | |
| download | master-187ad058-795063e4bd943a6f8b10d4ed11ddce8aad604771.tar.gz master-187ad058-795063e4bd943a6f8b10d4ed11ddce8aad604771.tar.bz2 master-187ad058-795063e4bd943a6f8b10d4ed11ddce8aad604771.zip | |
x86: make x86_64 a subtarget instead of a standalone target
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45115 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86_64/base-files')
4 files changed, 0 insertions, 93 deletions
diff --git a/target/linux/x86_64/base-files/etc/inittab b/target/linux/x86_64/base-files/etc/inittab deleted file mode 100644 index ca90fd8a2a..0000000000 --- a/target/linux/x86_64/base-files/etc/inittab +++ /dev/null @@ -1,4 +0,0 @@ -::sysinit:/etc/init.d/rcS S boot -::shutdown:/etc/init.d/rcS K shutdown -ttyS0::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login diff --git a/target/linux/x86_64/base-files/lib/preinit/15_essential_fs_x86 b/target/linux/x86_64/base-files/lib/preinit/15_essential_fs_x86 deleted file mode 100644 index 5d5453093f..0000000000 --- a/target/linux/x86_64/base-files/lib/preinit/15_essential_fs_x86 +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# Copyright (C) 2006-2010 OpenWrt.org -# Copyright (C) 2010 Vertical Communications - -do_mount_procfs() { - mount -o noatime -t proc none /proc -} - diff --git a/target/linux/x86_64/base-files/lib/preinit/79_move_config b/target/linux/x86_64/base-files/lib/preinit/79_move_config deleted file mode 100644 index cdcf683a22..0000000000 --- a/target/linux/x86_64/base-files/lib/preinit/79_move_config +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# Copyright (C) 2012-2014 OpenWrt.org - -move_config() { - . /lib/upgrade/platform.sh - - if platform_export_bootpart; then - mount -t ext4 -o rw,noatime "$BOOTPART" /mnt - mv -f /mnt/sysupgrade.tgz / - umount /mnt - fi -} - -boot_hook_add preinit_mount_root move_config - diff --git a/target/linux/x86_64/base-files/lib/upgrade/platform.sh b/target/linux/x86_64/base-files/lib/upgrade/platform.sh deleted file mode 100644 index 73ab5ef079..0000000000 --- a/target/linux/x86_64/base-files/lib/upgrade/platform.sh +++ /dev/null @@ -1,66 +0,0 @@ -platform_export_bootpart() { - local cmdline uuid disk - - if read cmdline < /proc/cmdline; then - case "$cmdline" in - *block2mtd=*) - disk="${cmdline##*block2mtd=}" - disk="${disk%%,*}" - ;; - *root=*) - disk="${cmdline##*root=}" - disk="${disk%% *}" - ;; - esac - - case "$disk" in - PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02) - uuid="${disk#PARTUUID=}" - uuid="${uuid%-02}" - for disk in /dev/[hsv]d[a-z]; do - set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "') - if [ "$4$3$2$1" = "$uuid" ]; then - export BOOTPART="${disk}1" - return 0 - fi - done - ;; - /dev/*) - export BOOTPART="${disk%[0-9]}1" - return 0 - ;; - esac - fi - - return 1 -} - -platform_check_image() { - [ "$#" -gt 1 ] && return 1 - - case "$(get_magic_word "$1")" in - eb48|eb63) return 0;; - *) - echo "Invalid image type" - return 1 - ;; - esac -} - -platform_copy_config() { - if [ -b "$BOOTPART" ]; then - mount -t ext4 -o rw,noatime "$BOOTPART" /mnt - cp -af "$CONF_TAR" /mnt/ - umount /mnt - fi -} - -platform_do_upgrade() { - platform_export_bootpart - - if [ -b "${BOOTPART%[0-9]}" ]; then - sync - get_image "$@" | dd of="${BOOTPART%[0-9]}" bs=4096 conv=fsync - sleep 1 - fi -} |