Commit Graph

41 Commits (e07c80dfc881daed67c495d99885cc045f70d89a)

Author SHA1 Message Date
Jo-Philipp Wich 699f7ecd15 x86: use sysfs DMI information to populate sysinfo
Use the DMI data available in sysfs to extract manufacturer and model info
and write it to /tmp/sysinfo/.

The data will be picked up by board_detect and can be used by e.g. LuCI to
display a more appropriate model description.

On an APU board the files will contain the following values:

    # cat /tmp/sysinfo/model
    PC Engines APU

    # cat /tmp/sysinfo/board_name
    pc-engines-apu

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-06-06 15:18:11 +02:00
Jo-Philipp Wich 1012701014 x86: generalize partition discovery for sysupgrade
Generalize the partition discovery in sysupgrade in order to fix sysupgrade
and config backup/recovery on MMC block devices which use a different naming
scheme compared to mtdblock or sd* devices.

The change also adds the find applet to the ramdisk utilities so that upgrade
code can rely on it.

The commit is based on the initial submission by Russell Senior at
http://patchwork.ozlabs.org/patch/625440/ .

Signed-off-by: Russell Senior <russell@personaltelco.net>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-05-24 13:30:58 +02:00
John Crispin dc92917409 image / basefiles: make console password configurable
Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
Signed-off-by: John Crispin <john@phrozen.org>
2016-04-18 21:53:07 +02:00
Jo-Philipp Wich 924fb794bd x86: search PARTUUID in any block device
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-03-30 03:19:23 +02:00
Jo-Philipp Wich 9f422eba7c x86: make sysupgrade work without partx
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-03-30 03:10:51 +02:00
Hauke Mehrtens 8a7b28071f x86: fix platform_export_bootpart() for Xen virtual disks
Virtual disk devices in a Xen virtual machine (DomU) can be /dev/xvda,
/dev/xvdb and so on with partitions like /dev/xdva1. Devices named like
this where not considered before. This resulted in a non working
sysupgrade, because the boot partition could not be found.

Signed-off-by: Alexander Dahl <alex@netz39.de>
Suggested-by: Matthias Schiffer <mschiffer@universe-factory.net>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 49190
2016-04-17 13:24:30 +00:00
Jo-Philipp Wich 4aeeead303 x86: preserve partition table on sysupgrade
With this patch sysupgrade will write directly to the partitions
instead of to the main disk.  The UUID is copied from the image
to the MBR as well.  This prevents the mbr from being completely
overwritten and losing the partition table.  The -p option has
been added to maintain the original behavior and overwite the
entire disk with the new image.  Tests have been added to ensure
that the image partitions match up with the active partitions.

Signed-off-by: Rob Mosher <nyt-openwrt@countercultured.net>

SVN-Revision: 48682
2016-02-09 12:33:17 +00:00
Felix Fietkau ad3220aa8b x86: remove redundant default network config
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48530
2016-01-28 18:19:59 +00:00
Jo-Philipp Wich 02e2548b84 x86: use PARTUUID instead explicitly specifying the device by default
This changes the x86 image generation to match x86_64, using the PARTUUID for
the rootfs instead of explicitly configuring the device.

It unbreaks KVM with VirtIO, which uses /dev/vda2 instead of /dev/sda2.

Tested in QEMU/KVM with VirtIO, VirtualBox and VMware.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>

SVN-Revision: 44966
2015-03-24 10:08:12 +00:00
Felix Fietkau d2b08fb4ab x86: remove old soekris config hacks, install a more appropriate default /etc/config/network with lan+wan
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42888
2014-10-12 20:25:30 +00:00
Steven Barth c118e5edf4 network: Unbind DHCPv6 from underlying interfaces
This allows IPv6 to set up without IPv4 being up thus
IPv6-only or IPv6+DS-Lite working with the default config.

Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 42848
2014-10-08 13:08:05 +00:00
John Crispin f933a741a9 target/linux/*/base-files/lib/upgrade/platform.sh - wrong check for ARGC
ARGC is a 'C-ism', but not known/valid in shell-syntax - insert the correct
var $# (=number of args) here. under normal conditions this had no impact,
but we should at least correct it. the error was observable like this:

root@box:~ [ -e "/etc/functions.sh" ] && . /etc/functions.sh
root@box:~ [ -e "/lib/functions.sh" ] && . /lib/functions.sh
root@box:~ . /lib/upgrade/platform.sh
root@box:~ . /lib/upgrade/common.sh
root@box:~ platform_check_image /tmp/myfirmware.bin
ash: bad number
root@box:~ echo $?
0

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>

SVN-Revision: 40915
2014-06-02 12:43:22 +00:00
Felix Fietkau a14437024c x86: fix sysupgrade
Function move_config should be called after or during preinit_mount_root
hook in do_mount_root function. At this state sysupgrade.tgz is not in its
place during that time when do_mount_root is called. Function move_config
is called later so the sysupgrade.tgz stays in root directory to the second
restart when it is unpacked properly.

This patch adds move_config function to preinit_mount_root hook instead
of preinit_main and changes the filename of script to be called before
80_mount_root is called. It will prepare the sysupgrade archive for do_mount_root
within preinit_mount_root hook.

This patch solves ticket #15042 and #14088.

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>

SVN-Revision: 39996
2014-03-21 15:55:07 +00:00
John Crispin f0b5e7d419 x86: change /dev/console to tty to fix job control
Job control is turned off because it cannot obtain controlling terminal on
/dev/console, so it is impossible to do any job control operation behind
real x86 device (keyboard+monitor or virtualized).

This patch switches /dev/console to tty devices for ash on x86 generic target.

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>

SVN-Revision: 37693
2013-08-04 17:05:33 +00:00
Felix Fietkau b95bdc8ab5 kernel/base-files: clean up old code related to refreshing mtd partitions, it is no longer used anywhere
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37282
2013-07-14 12:56:58 +00:00
John Crispin 831c7ea04f preinit: move cmdline failsafe= handling ot the generic code
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36430
2013-04-25 19:02:37 +00:00
Steven Barth 4e8f7f37ed Change default IPv6 config to enable DHCPv6-PD
SVN-Revision: 36384
2013-04-22 19:40:16 +00:00
Steven Barth ea94d66b0f Adapt default network configuration for IPv6
SVN-Revision: 36278
2013-04-09 08:03:08 +00:00
Mirko Vogt 439a869090 Do not overload mount-call - trying to reduce confusion
The behaviour of calling 'mount' differed depending on whether it called
the busybox-mount, the mount of util-linux, the mount defined in
/lib/functions.sh and /lib/functions/boot.sh

/etc/preinit even included /lib/functions.sh and /lib/functions/boot.sh,
both re-defining 'mount'.

SVN-Revision: 34792
2012-12-19 16:07:46 +00:00
Jo-Philipp Wich f600ec5b3b x86: allow both old and new grub signatures in sysupgrade
SVN-Revision: 33898
2012-10-23 16:34:00 +00:00
Felix Fietkau 95e642632a x86: correct image magic for grub2 images
Sysupgrade broke on x86 when grub2 superceded grub.  This patch
corrects tha magic_word to be expected in grub2 combined images.

Signed-off-by: Russell Senior <russell@personaltelco.net>

SVN-Revision: 33890
2012-10-22 16:06:29 +00:00
Felix Fietkau a1bcd25082 x86: add grub2 iso support
SVN-Revision: 33639
2012-10-07 23:01:52 +00:00
Vasilis Tsiligiannis 1978c07539 Fix sysupgrade for squashfs, jffs2 and ext4 images
* use 'fsync' with 'dd' for image writing
	* save config to boot partition

SVN-Revision: 32465
2012-06-19 22:36:53 +00:00
Felix Fietkau 5571acdbd0 x86/soekris: Add defconfig for soekris net4801 and net4826
Add default config file for net4801 and 4826 and initial script
to copy config file like it is done for other platforms.

Patch from: kentarou matsuyama <matsuyama@thinktube.com>

SVN-Revision: 25103
2011-01-26 11:33:46 +00:00
Felix Fietkau 3d9d5cee8a x86/soekris: Add script to detect soekris model
Add script to detect soekris board of net4801 and net4826.

Patch from: kentarou matsuyama <matsuyama@thinktube.com>

SVN-Revision: 25102
2011-01-26 11:33:42 +00:00
Nicolas Thill 1fc7da0306 sysupgrade: fix typo in platform_do_upgrade() on x86 (closes: #7068), thanks to acinonyx
SVN-Revision: 20703
2010-04-04 15:47:26 +00:00
Florian Fainelli e1a4f69cb5 sysupgrade: Get target device from kernel cmdline, patch from acinonyx
SVN-Revision: 20538
2010-03-28 11:55:07 +00:00
Jo-Philipp Wich 817d27bcdc sysupgrade: Dump image to sda device instead of hda (patch by Acinonyx)
SVN-Revision: 20514
2010-03-27 15:28:17 +00:00
Jo-Philipp Wich c63fd559fc base-files: remove redundant "Press " when writing enter failsafe message
SVN-Revision: 20393
2010-03-23 22:57:16 +00:00
Jo-Philipp Wich 9feb2ed7c5 preinit: use grep -q where applicable
SVN-Revision: 19479
2010-02-01 00:33:34 +00:00
Felix Fietkau b88fc11e2a preinit: Remove Ctrl-C prompt...impossible on /dev/console (patch by cshore)
SVN-Revision: 19367
2010-01-28 19:27:49 +00:00
Felix Fietkau 56bc02a305 add preinit modularization work by Daniel Dickinson (cshore)
SVN-Revision: 19331
2010-01-25 17:11:17 +00:00
Jo-Philipp Wich 5231811851 sysupgrade-ext2 sync before writing image, not after Sysupgrade for ext2 currently flushes the filesystem buffers after an image is written to the disk. This should happen before the image is written.
SVN-Revision: 16867
2009-07-16 13:39:36 +00:00
Felix Fietkau 065306a9a8 fix small logic error in x86 sysupgrade script, which prevented upgrades from jffs2 to squashfs (#3321)
SVN-Revision: 12672
2008-09-23 17:46:23 +00:00
Felix Fietkau f47a4a58c5 fix sysupgrade support for brcm-2.4 and brcm47xx make mtd refresh based config append optional (leave enabled on x86)
SVN-Revision: 12657
2008-09-23 11:05:54 +00:00
Travis Kemen 7346ef83e1 fix sysupgrade endian issues
SVN-Revision: 11900
2008-07-22 01:11:30 +00:00
Felix Fietkau 39a43187f3 silence a bogus preinit message
SVN-Revision: 9429
2007-10-24 17:14:09 +00:00
Gabor Juhos 438dfe5c6f get rid of per-profile base-files
SVN-Revision: 9069
2007-09-29 14:27:54 +00:00
John Crispin f3b9e06a14 made HOME=/root global instead of x86 specific
SVN-Revision: 8845
2007-09-19 19:58:07 +00:00
John Crispin 0a08fde2dc root users folder is now in the fs and no longer /tmp
SVN-Revision: 8844
2007-09-19 19:51:11 +00:00
Felix Fietkau 56231056ea strip the kernel version suffix from target directories, except for brcm-2.4 (the -2.4 will be included in the board name here). CONFIG_LINUX_<ver>_<board> becomes CONFIG_TARGET_<board>, same for profiles.
SVN-Revision: 8653
2007-09-06 16:27:37 +00:00