aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/base-files
Commit message (Collapse)AuthorAgeFilesLines
* x86: fix grub-bios-setup fail during sysupgrade李国2020-04-091-1/+1
| | | | | | | | | | grub-bios-setup requires two images (boot.img and core.img), but they are missing. This make an error during sysupgrade: Upgrading bootloader on /dev/sda... grub-bios-setup: error: cannot open `/tmp/boot/boot/grub/boot.img': No such file or directory. Signed-off-by: 李国 <uxgood.org@gmail.com>
* x86: generate EFI platform bootable images李国2020-03-313-9/+24
| | | | | | | | | | | | | | | | | Add EFI platform bootable images for x86 platforms. These images can also boot from legacy BIOS platform. EFI System Partition need to be fat12/fat16/fat32 (not need to load filesystem drivers), so the first partition of EFI images are not ext4 filesystem any more. GPT partition table has an alternate partition table, we did not generate it. This may cause problems when use these images as qemu disk (kernel can not find rootfs), we pad enough sectors will be ok. Signed-off-by: 李国 <uxgood.org@gmail.com> [part_magic_* refactoring, removed genisoimage checks] Signed-off-by: Petr Štetiar <ynezz@true.cz>
* x86: add preinit hook for bootloader upgradeTomasz Maciej Nowak2020-03-012-1/+21
| | | | | | | | | | | | | | | | This commit fills the void for current OpenWrt installations which will be still on old bootloader version even after "x86: add bootloader upgrade on sysupgrade", since it performs bootloader upgrade only on sysupgrade. To keep all OpenWrt deploynents on the same GRUB version, add preinit hook, which will perform upgrade of the bootloader on first boot after sysupgrade. It's temporary solution and should be deleted, when the first release including this hook will no longer be supported by OpenWrt team. We can assume that all installations should be on current bootolader version and from there sysupgrade routine will be sufficient. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* x86: add bootloader upgrade on sysupgradeTomasz Maciej Nowak2020-03-011-0/+24
| | | | | | | | | | | | | | Currently bootloader always stays on the same version as when first written to boot medium (not true if partition layout changed, which will trigger sysupgrade process to write full disk image). That creates inconveniences as it always stays with same features or/and bugs. Users wishing to add support to additional modules or new version, would need to write the whole image, potentially destroying previous system configuration. To fix these, this commit adds additional routine to sysupgrade which upgrades unconditionally the bootloader to the latest state provided by OpenWrt. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* treewide: use new procd sysupgrade $UPGRADE_BACKUP variableRafał Miłecki2019-09-051-1/+1
| | | | | | | | | | It's a variable set by procd that should replace hardcoded /tmp/sysupgrade.tgz. This change requires the most recent procd with the commit 0f3c136 ("sysupgrade: set UPGRADE_BACKUP env variable"). Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
* treewide: when copying a backup file always specify dest nameRafał Miłecki2019-09-051-1/+1
| | | | | | | $CONF_TAR shouldn't be assumed to always point to the sysupgrade.tgz. This change makes code more generic and allows refactoring $CONF_TAR. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
* treewide: don't hardcode "sysupgrade.tgz" file nameRafał Miłecki2019-09-051-2/+2
| | | | | | | | 1) Add BACKUP_FILE and use it when copying an archive to be restored after sysupgrade (on the next preinit). 2) Use CONF_TAR for copying backup prepared by the /sbin/sysupgrade Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
* treewide: sysupgrade: pass "save_partitions" option to the "sysupgrade" methodRafał Miłecki2019-08-221-1/+1
| | | | | | | This explicitly lets stage2 know if partitions should be preserved. No more "touch /tmp/sysupgrade.always.overwrite.bootdisk.partmap" hack. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
* x86: fix missing led variable warning during bootPetr Štetiar2019-06-251-0/+2
| | | | | | | | Fixes following warning during the boot: WARNING: Variable 'led' does not exist or is not an array/object Signed-off-by: Petr Štetiar <ynezz@true.cz>
* Revert "base-files: add console to inittab"Alexander Couzens2019-05-251-1/+0
| | | | | | | This reverts commit cde52cb4866fe8cf4a19bb2bb32ff7802e542e19. When using OpenWrt in qemu, the shell is unsuable Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
* base-files: add console to inittabPaul Spooren2019-05-211-0/+1
| | | | | | | | | | | When running OpenWrt inside an LXC container no shell is opend as LXC defaults to a virtual /dev/console. This patch allows to enter a shell after starting the container via `lxc-start`, without it is only posible to access a shell on tty1 via `lxc-console`. Signed-off-by: Paul Spooren <mail@aparcar.org>
* x86: make sysupgrade.tgz reachable againTomasz Maciej Nowak2018-12-031-1/+1
| | | | | | | | | Moving binding mount before check for saved sysupgrade configuration made it unreachable. Fix it by moving binding mount after the check. Fixes: f78b2616 (x86: mount writable bootfs) Reported-by: Lucian Cristian <luci@powerneth.ro> Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* Revert "x86: add intel microcode entries to grub config"John Crispin2018-11-271-4/+2
| | | | | | This reverts commit 546fced2a23557e95dd34246744c3aa6cad92fe6. Signed-off-by: John Crispin <john@phrozen.org>
* Revert "x86: add amd microcode entries to grub config"John Crispin2018-11-271-0/+12
| | | | | | This reverts commit a822283c7e56bb3b409712e0eb9af5a91aac247d. Signed-off-by: John Crispin <john@phrozen.org>
* x86: add amd microcode entries to grub configTomasz Maciej Nowak2018-11-261-12/+0
| | | | | | | | Create initrd enries for x86 images, that'll load amd microcode as early as possible. Also remove the preinit script responsible for late load of microcode. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* x86: add intel microcode entries to grub configTomasz Maciej Nowak2018-11-261-2/+4
| | | | | | | | | Create initrd enries for x86 images, that'll load intel microcode as early as possible. To achieve that the test module for grub is enabled which provides shell-like conditionals. Also restrict the late load of microcode to AMD processors. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* x86: mount writable bootfsTomasz Maciej Nowak2018-11-261-8/+4
| | | | | | | Mount boot file system with rw option to allow installation of packages which install files to /boot directory. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* x86: Add APU3 reference to x86 board.dKristian Evensen2018-05-182-2/+2
| | | | | | | | | | | There is a new APU-model available, APU3. The device is configured in the same way as the APU1 and APU2, so the same LED/network setup can be used. I considered changing the case to pc-engines-apu*, but I chose to follow the existing pattern and add the full board name. Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
* x86: add preinit hook to reload microcodeZoltan HERPAI2018-02-111-0/+10
| | | | Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
* x86: preinit: use board_name on Sm Super ServersPhilip Prindeville2018-01-041-1/+8
| | | | | | | | | Supermicro puts "Super Server" into their product_name DMI value for a whole slew of products, making this value about as useful as not having been filled in at all. Instead, fall back on the board_name instead. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
* x86: preinit: make name rewrite into reusable functionPhilip Prindeville2018-01-041-6/+10
| | | | | | | | There might be other places (such as vendor-supplied preinit scripts) where we wish to take a DMI name and clean it up in a consistent way, so make the sed command into a function. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
* treewide: use only board_name function to get nameMathias Kresin2017-07-152-6/+2
| | | | | | | | | | | | Do not parse /tmp/sysinfo/board_name, /proc/cpuinfo or the device tree compatible string directly. Always use the board_name function to get the board name. The admswconfig package still reads /proc/cpuinfo directly. The code looks somehow broken and the whole adm5120 which uses this package looks unmaintained. Leave it as it is for now. Signed-off-by: Mathias Kresin <dev@kresin.me>
* treewide: populate boardname and model earlierMathias Kresin2017-07-151-0/+0
| | | | | | | | | | | | | For targets using the generic board detection and board specific settings in diag.sh, the board name is still unset at the time the set_state() provided by diag.sh is called by 10_indicate_preinit. Change the execution order to ensure the boardname is populated before required the first time. Do the target specific board detection as early as possible, directly followed by the generic one to allow a seamless switch to the generic function for populating /tmp/sysinfo/. Signed-off-by: Mathias Kresin <dev@kresin.me>
* Add missing APU1 reference to x86 board.dKristian Evensen2017-06-062-2/+2
| | | | | | | | | | | | x86 board.d only contains a case for the APU2, not the APU1. This causes, for example, network configuration not to be created correctly. Even though the APU1 seems to reaching EOL, there a still a lot of them out there. The APU1 and APU2 is configured in the same way and this patch should also be considered for stable, as the error also exists there. Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
* x86: sysupgrade: explicitly rescan disk after writing partition tableMatthias Schiffer2017-05-291-0/+6
| | | | | | | This should ensure that the kernel partition can be mounted in platform_copy_config when its size has changed. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
* x86: sysupgrade: refactor platform_do_upgradeMatthias Schiffer2017-05-291-33/+36
| | | | | | | By returning early when no upgrade device can be found and handling the SAVE_PARTITIONS=0 case differently, we can get rid of two levels of if. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
* x86: sysupgrade: move partition table change check to platform_check_imageMatthias Schiffer2017-05-291-4/+25
| | | | | | | The staged sysupgrade will prevent us from using ask_bool in platform_do_upgrade; therefore, the check is moved to platform_check_image. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
* x86: keep /boot mounted for kexecDaniel Golle2017-05-051-4/+7
| | | | Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* x86: Add board configs for the PC Engines APU2Chris Blake2017-02-152-0/+8
| | | | | | | | This adds the default LED and network settings for the PC Engines APU2 when running under the x86 target. [dwmw2: Change Ethernet port setup] Signed-off-by: Chris Blake <chrisrblake93@gmail.com>
* x86: Enable DIAG LED on GeosDavid Woodhouse2017-02-152-1/+79
| | | | | | | | | Based on a patch from Chris Blake <chrisrblake93@gmail.com>, except let's do it by using the LED configuration instead of hard-coding it for each board type. And try using /bin/board_detect to do the default behaviour, on the first boot where the config hasn't yet been generated. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
* x86: Move Traverse Geos configs into x86 base-filesChris Blake2017-02-152-0/+45
| | | | | | | | | | This change moves the files in 657418d to the root of the x86 target. This is done in preperation for adding more devices under other subtargets. CC: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Chris Blake <chrisrblake93@gmail.com>
* x86: fix sysupgrades on disks with 4k block sizeFelix Fietkau2017-01-251-9/+2
| | | | | | | Even when the disk uses 4k blocks, the partition table still uses units of 512 byte sectors. Always use ibs=512 for the offsets Signed-off-by: Felix Fietkau <nbd@nbd.name>
* x86/generic: add xen DomU supportFelix Fietkau2017-01-161-0/+1
| | | | | | Copy the relevant config options from the xen_domu subtarget Signed-off-by: Felix Fietkau <nbd@nbd.name>
* base-files: export x86 platform upgrade functions to common.shYousong Zhou2017-01-052-96/+5
| | | | Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
* x86: move sysupgrade.tgz only if it existsYousong Zhou2017-01-051-3/+6
| | | | | | | | To squash error messages at boot time mv: can't rename '/mnt/sysupgrade.tgz': No such file or directory Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
* x86: use sysfs DMI information to populate sysinfoJo-Philipp Wich2016-06-061-0/+28
| | | | | | | | | | | | | | | | | | 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>
* x86: generalize partition discovery for sysupgradeJo-Philipp Wich2016-05-242-25/+54
| | | | | | | | | | | | | | | 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>
* image / basefiles: make console password configurableJohn Crispin2016-04-181-2/+2
| | | | | Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com> Signed-off-by: John Crispin <john@phrozen.org>
* x86: search PARTUUID in any block deviceJo-Philipp Wich2016-03-301-1/+2
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* x86: make sysupgrade work without partxJo-Philipp Wich2016-03-301-6/+28
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* x86: fix platform_export_bootpart() for Xen virtual disksHauke Mehrtens2016-04-171-1/+1
| | | | | | | | | | | | | 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
* x86: preserve partition table on sysupgradeJo-Philipp Wich2016-02-091-2/+49
| | | | | | | | | | | | | | 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
* x86: remove redundant default network configFelix Fietkau2016-01-281-26/+0
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48530
* x86: use PARTUUID instead explicitly specifying the device by defaultJo-Philipp Wich2015-03-242-38/+53
| | | | | | | | | | | | | 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
* x86: remove old soekris config hacks, install a more appropriate default ↵Felix Fietkau2014-10-124-56/+7
| | | | | | | | /etc/config/network with lan+wan Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 42888
* network: Unbind DHCPv6 from underlying interfacesSteven Barth2014-10-081-1/+1
| | | | | | | | | 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
* target/linux/*/base-files/lib/upgrade/platform.sh - wrong check for ARGCJohn Crispin2014-06-021-1/+1
| | | | | | | | | | | | | | | | | | | 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
* x86: fix sysupgradeFelix Fietkau2014-03-211-1/+1
| | | | | | | | | | | | | | | | | | | 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
* x86: change /dev/console to tty to fix job controlJohn Crispin2013-08-041-0/+4
| | | | | | | | | | | | 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
* kernel/base-files: clean up old code related to refreshing mtd partitions, ↵Felix Fietkau2013-07-141-6/+0
| | | | | | | | it is no longer used anywhere Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 37282