Commit Graph

56 Commits

Author SHA1 Message Date
Alain Kalker
4fc2b8ee96 busybox-initramfs: Skip and warn instead of error on module load failure
When a kernel module fails to load, produce a warning instead of
an error and skip that module instead of halting the system.

Currently uses progress() for the warning, we may need a better
alternative.

Signed-off-by: Alain Kalker <a.c.kalker@gmail.com>
2012-05-15 00:12:38 +02:00
Stephan Raue
a4c48a52b4 busybox-initramfs: fix fbset command again, thanks to Dom
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2012-05-12 23:24:43 +02:00
Stephan Raue
cc4d054cc8 busybox-initramfs: set vxres and vyres values for fbset too, thanks to Dom
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2012-05-11 19:58:03 +02:00
Stephan Raue
a9fa8a5dd9 busybox-initramfs: add support for renamed KERNEL and SYSTEM
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2012-05-04 07:17:07 +02:00
Stephan Raue
79d6369d99 Merge pull request #566 from stefansaraev/busybox
busybox-initramfs: check md5 sums before OS upgrade
2012-05-03 19:17:51 -07:00
Stephan Raue
851bebf4c3 busybox-initramfs: readd support for oemsplash and project based splash
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2012-05-03 22:58:23 +02:00
Stefan Saraev
afe0488a84 busybox-initramfs: check md5 sums before OS upgrade 2012-05-03 14:50:34 +03:00
Stephan Raue
aa768e399e busybox-initramfs: add support to start splash in initramfs
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2012-05-03 13:03:33 +02:00
Stephan Raue
4aa04fd8f4 Merge pull request #358 from ackalker/initramfs-kernel-modules
Enhancement: Load kernel modules in initramfs init
2012-05-02 22:14:49 -07:00
Stephan Raue
4de0d1344b busybox-initramfs: try longer to mount partitions, its needed on slow devices like RPi
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2012-05-02 07:35:30 +02:00
Alain Kalker
52898a1dc1 busybox-initramfs: init: fix loading of kernel modules
Add missing .ko to module name.

Signed-off-by: Alain Kalker <a.c.kalker@gmail.com>
2012-04-27 16:05:40 +02:00
Stephan Raue
5a2f6b4e9f busybox-initramfs: force reading $disk and $boot variable via /proc/cmdline
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2012-04-12 15:01:57 +02:00
Stephan Raue
d98af29041 Merge pull request #375 from ackalker/initramfs-iscsi-support
initramfs init: add support for iSCSI mounts, this fixes #269
2012-03-27 11:09:48 -07:00
Alain Kalker
ee48f9a59a busybox-initramfs: init: add support for iSCSI mounts
Add support for iSCSI mounts.

Based on the work by Yann Cézard <eesprit@free.fr> , adapted to the new syntax.

Example usage:

Example 1: Autoconfigure network based on iBFT, autologin to iSCSI target
based on iBFT, mount partition with label 'Storage':

disk=ISCSI=auto,LABEL=Storage

Example 2: Specify any needed iSCSI options, mount partition 1 on /dev/sdb:

disk=ISCSI=param1=val1,param2=val2,...,/dev/sdb1

Note: the parameter after the very last comma _must_ be a valid LABEL=, UUID=
or device path.

Signed-off-by: Alain Kalker <a.c.kalker@gmail.com>
2012-03-26 19:29:29 +02:00
Yann Cézard
527388ef66 Add iSCSI modules into kernel.
Fix build script + updated init.
2012-03-26 03:54:42 +02:00
Yann Cézard
d00667dbe4 Add support for iscsi on boot to initrd (only built and added if ISCSI_SUPPORT is enabled in options). 2012-03-26 03:54:41 +02:00
Alain Kalker
fb3b784476 busybox-initramfs: init: Add user-defined mount options for NFS mounts
This adds the possibility of specifying extra mount options for NFS mounts.

Example usage: disk=NFS=192.168.1.1:/export,proto=udp

Feature request and patch submitted by: Björn Ketelaars <bjorn.ketelaars@hydroxide.nl>

Signed-off-by: Alain Kalker <a.c.kalker@gmail.com>
2012-03-25 14:28:11 +02:00
Alain Kalker
16a3f22836 busybox-initramfs: init: cleanup, improve readability
Use consistent whitespace for all `progress "..."` lines.
Don't mount $disk if it is not set (e.g. in the installer).
Don't check for /storage/$OVERLAY_DIR, just create it.
Move the overlay functionality into an if statement.
Don't move /storage if $disk is not set (e.g. in the installer).

Signed-off-by: Alain Kalker <a.c.kalker@gmail.com>
2012-03-20 22:18:39 +01:00
Alain Kalker
56b29979f6 busybox-initramfs: init: Allow overlay mount for mount types with parameters
This fixes overlay mount so it doesn't add $OVERLAY_DIR at the end of the
parameter list.
Kernel commandline parameter 'overlay' should now work for both NFS and
CIFS/SMB mounts, but alas, busybox CIFS mount doesn't (yet) support subdir
mounts (regular mount does). Leaving this in for posterity.

Signed-off-by: Alain Kalker <a.c.kalker@gmail.com>
2012-03-20 20:40:06 +01:00
Alain Kalker
03fcc58fae busybox-initramfs: init: Don't suppress output when debugging
When debugging, any information about the problem is valuable, so don't
suppress output.
Add a variable: SILENT_OUT whose value is the file descriptor to use for
commands that should normally be silent.
Idea taken from buildsystem's config/path , and slightly shortened.

Signed-off-by: Alain Kalker <a.c.kalker@gmail.com>
2012-03-20 20:40:06 +01:00
Alain Kalker
0de52e9de0 busybox-initramfs: init: cosmetics
Don't add general mount options to NFS_OPTIONS, pass them as combined options
instead.

Signed-off-by: Alain Kalker <a.c.kalker@gmail.com>
2012-03-20 20:40:06 +01:00
Alain Kalker
4f0052a875 busybox-initramfs: init: add support for CIFS mounts
Example usage:
 disk=CIFS=//192.168.1.1/share,user=name,password=secret
 disk=SMB=//192.168.1.1/public,user=guest

Note: comma's ',' are not allowed in
CIFS options (for example in usernames or passwords) because they are used
to separate options.
Note: SMB is an alias for CIFS, for people who are more used to that name.

Signed-off-by: Alain Kalker <a.c.kalker@gmail.com>
2012-03-20 20:37:58 +01:00
Alain Kalker
b68c832489 busybox-initramfs: init: add kernel commandline parameter: overlay
Adds a new kernel commandline parameter: overlay , which enables multiple
clients to use a single configuration file while keeping their storage mounts
separate. For the given example, the storage mounts will be under
/var/lib/overlay/<mac-address>
This will only work with mount types which support subdirectory mounts.

Example usage: disk=NFS=192.168.1.1:/var/lib/overlay overlay

Signed-off-by: Alain Kalker <a.c.kalker@gmail.com>
2012-03-19 18:55:38 +01:00
Alain Kalker
cd052262f8 busybox-initramfs: init: add support for NFS mounts
Example usage: boot=NFS=192.168.1.1:/tftpboot

Signed-off-by: Alain Kalker <a.c.kalker@gmail.com>
2012-03-19 18:53:27 +01:00
Alain Kalker
ac1d0eb0d9 busybox-initramfs: init: add support for NBD mounts
Example kernel command parameter: boot=NBD=192.168.1.1:2000

Signed-off-by: Alain Kalker <a.c.kalker@gmail.com>
2012-03-19 18:47:58 +01:00
Alain Kalker
a3f3a62767 busybox-initramfs: reorganize init script in preparation for boot type handlers
Changes to kernel commandline parameters:

Remove legacy parameters, to be added back later if desired.
Add a new parameter: break=<all|step,step,...> which will cause a debugging
shell to be started after each or the specified boot steps.

Functions:

mount_part, mount_disk, mount_nbd: reorganize to use mount type handlers, which
will support specifying kernel parameters like boot=TYPE=target and
disk=TYPE=target. This initial commit only has mount_default, which supports
LABEL=label and UUID=uuid, as well as block devices /dev/* and image files.

error: show more meaningful error messages, containing the boot step and action
which caused the error.
If not debugging, halt the system. This prevents the error from causing more
damage further on in the boot sequence. If debugging, start a debugging shell.

update: make sure the file to update already exists at the destination, to
prevent clobbering a rootfs mounted on /flash, which can be the case when
mounting a mtd or NBD device.

load_modules: enable loading of kernel modules in early boot, e.g. xhci-hcd
to enable mount of USB3 devices on boot.

Add a simple boot step sequencer, which allows for starting a debugging shell
after each step.

Signed-off-by: Alain Kalker <a.c.kalker@gmail.com>
2012-03-19 18:47:44 +01:00
Domin6
543c89c24b Change copyright and FSF address, this fixes #252 2012-02-29 13:36:32 +01:00
Stephan Raue
f50451add7 busybox-initramfs: 'clear' must be called via busybox here
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2012-02-28 09:29:07 +01:00
Stephan Raue
a37e76f99d busybox-initramfs: clear screen on boot and hide cursor if possible
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2012-02-24 08:12:19 +01:00
Stephan Raue
1df8403a88 busybox-initramfs: dont start splash here
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2012-02-23 21:36:21 +01:00
Stephan Raue
b45628754b busybox-initramfs: use splashutils instead busybox's fbsplash
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2012-02-23 03:16:54 +01:00
Stephan Raue
d66f206af5 busybox-initramfs: use 'fbsplash' for bootsplash
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2012-02-07 01:26:56 +01:00
Stephan Raue
93f3737a94 openssh: dont run ssh per default, there is a security related discussion in http://openelec.tv/forum/20-development-discussion/20259-security-the-dilema-of-the-out-of-the-box-experience . Add 'ssh' to the appendline in our bootloader, or put a file called 'ssh_enable' in /storage/.config or the 'Configfile' Samba share. Both will enable SSH on boot. Add 'progress' to the appendline in bootloader to show the bootprogress without enabled debugging.
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2011-12-22 20:38:15 +01:00
Stephan Raue
49aee97185 plymouth-lite: install bins to /bin
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2011-11-06 22:01:22 +01:00
Stephan Raue
88389d7b7b Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
Conflicts:
	packages/initramfs/sysutils/busybox-initramfs/scripts/init
2011-09-19 16:34:14 +02:00
Stephan Raue
5d1a99441b busybox-initramfs: dont unmount some special filesystems here and mount again in OS, insteaded move mountpoints
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2011-09-19 11:37:38 +02:00
Stephan Raue
ffd4d22705 Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
Conflicts:
	packages/initramfs/sysutils/busybox-initramfs/scripts/init
2011-09-17 14:59:20 +02:00
Stephan Raue
07610579a1 busybox-initramfs: optimize disk check function in init script
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2011-09-17 14:43:51 +02:00
Stephan Raue
3f879ab8d1 busybox-initramfs: fix init script
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2011-09-12 19:56:55 +02:00
Stephan Raue
6f92ac534d Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
Conflicts:
	packages/initramfs/sysutils/busybox-initramfs/scripts/init
2011-09-12 19:55:36 +02:00
Stephan Raue
24f8bace6a Revert "busybox-initramfs: unmount /storage if not more needed, will be mounted again from system"
This reverts commit c71ea4e731.
2011-09-12 19:15:17 +02:00
Stephan Raue
e47c0b9412 Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
Conflicts:
	packages/initramfs/sysutils/busybox-initramfs/scripts/init
2011-09-09 01:16:05 +02:00
Stephan Raue
c71ea4e731 busybox-initramfs: unmount /storage if not more needed, will be mounted again from system
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2011-09-08 04:28:43 +02:00
Stephan Raue
b771459332 Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv into openelec-next
Conflicts:
	packages/initramfs/sysutils/busybox-initramfs/scripts/init
	projects/Fusion/linux/linux.x86_64.conf
2011-06-14 09:21:11 +02:00
Stephan Raue
ed1a1ae8a7 busybox-initramfs: check fs only on hfs and hfs+ fs again
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2011-06-13 21:28:24 +02:00
Stephan Raue
3336822161 Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv into openelec-next
Conflicts:
	packages/initramfs/sysutils/busybox-initramfs/scripts/init
2011-06-08 00:49:37 +02:00
Travis Glenn Hansen
097b4049f4 making init check for /flash/MACH_KERNEL instead of /flash/atv_single_boot for update forcefully disabling when 'nvidia' is in the list of GRAPHIC_DRIVERS letting atv-bootloader include default initrd in the kernel 2011-06-07 21:53:02 +02:00
Stephan Raue
169e2c31ee Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv into openelec-next
Conflicts:
	packages/initramfs/sysutils/busybox-initramfs/scripts/init
2011-06-06 02:40:17 +02:00
Stephan Raue
aa1e756081 busybox-initramfs: simplyfing fsck command, cleanups
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2011-06-05 19:16:36 +02:00
Stephan Raue
745d4e5d9b busybox-initramfs: change fsck command syntax to util-linux's fsck
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2011-06-05 14:07:23 +02:00