mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-09 21:05:24 +01:00
Remove the notion of "sys*"
- This idea originates from very early in the project and was, at the
time, a very easy way to categorise things.
- Now, it doesn't really make much sense - it is fairly arbitary, often
occuring when there is a change in kernel, but not from builder-hex0
to fiwix, and sysb is in reality completely unnecessary.
- In short, the sys* stuff is a bit of a mess that makes the project
more difficult to understand.
- This puts everything down into one folder and has a manifest file that
is used to generate the build scripts on the fly rather than using
coded scripts.
- This is created in the "seed" stage.
stage0-posix -- (calls) --> seed -- (generates) --> main steps
Alongside this change there are a variety of other smaller fixups to the
general structure of the live-bootstrap rootfs.
- Creating a rootfs has become much simpler and is defined as code in
go.sh. The new structure, for an about-to-be booted system, is
/
-- /steps (direct copy of steps/)
-- /distfiles (direct copy of distfiles/)
-- all files from seed/*
-- all files from seed/stage0-posix/*
- There is no longer such a thing as /usr/include/musl, this didn't
really make any sense, as musl is the final libc used. Rather, to
separate musl and mes, we have /usr/include/mes, which is much easier
to work with.
- This also makes mes easier to blow away later.
- A few things that weren't properly in packages have been changed;
checksum-transcriber, simple-patch, kexec-fiwix have all been given
fully qualified package names.
- Highly breaking change, scripts now exist in their package directory
but NOT WITH THE packagename.sh. Rather, they use pass1.sh, pass2.sh,
etc. This avoids manual definition of passes.
- Ditto with patches; default directory is patches, but then any patch
series specific to a pass are named patches-passX.
This commit is contained in:
parent
0907cfd073
commit
6ed2e09f3a
546 changed files with 700 additions and 1299 deletions
9
steps/jump/fiwix.sh
Executable file
9
steps/jump/fiwix.sh
Executable file
|
|
@ -0,0 +1,9 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -ex
|
||||
|
||||
# Build the ext2 image
|
||||
make_fiwix_initrd
|
||||
|
||||
# Boot Fiwix
|
||||
kexec-fiwix
|
||||
28
steps/jump/linux.sh
Executable file
28
steps/jump/linux.sh
Executable file
|
|
@ -0,0 +1,28 @@
|
|||
#!/bin/bash
|
||||
|
||||
. /steps/bootstrap.cfg
|
||||
|
||||
set -e
|
||||
|
||||
# Perform the actual kexec
|
||||
if [ "${KERNEL_BOOTSTRAP}" = True ]; then
|
||||
sync
|
||||
# We don't use the gen_initramfs_list.sh script because it is so *SLOW*
|
||||
# This emulates the same thing it does
|
||||
find / -xdev -type d -printf "dir %p %m %U %G\n" >> /initramfs.list
|
||||
find / -xdev -type f -printf "file %p %p %m %U %G\n" >> /initramfs.list
|
||||
find / -xdev -type l -printf "slink %p %l %m %U %G\n" >> /initramfs.list
|
||||
find / -xdev -type c -or -type b -not -name "ram*" -printf "nod %p %m %U %G %y " -exec stat -c '%Hr %Lr' {} \; >> /initramfs.list
|
||||
kexec-linux "/dev/ram1" "/boot/linux-4.9.10" "!$(command -v gen_init_cpio) /initramfs.list"
|
||||
else
|
||||
mkdir /etc
|
||||
# kexec time
|
||||
if [ "${BARE_METAL}" = True ]; then
|
||||
kexec -l "/boot/linux-4.9.10" \
|
||||
--append="root=/dev/sda1 rootfstype=ext3 init=/init rw"
|
||||
else
|
||||
kexec -l "/boot/linux-4.9.10" --console-serial \
|
||||
--append="console=ttyS0 root=/dev/sda1 rootfstype=ext3 init=/init rw"
|
||||
fi
|
||||
kexec -e
|
||||
fi
|
||||
27
steps/jump/move_disk.sh
Executable file
27
steps/jump/move_disk.sh
Executable file
|
|
@ -0,0 +1,27 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -ex
|
||||
|
||||
# Create partition if it doesn't exist
|
||||
if [ $(($(stat -c "%Lr" "/dev/${DISK}") % 8)) -eq 0 ]; then
|
||||
echo "Creating partition table..."
|
||||
echo ";" | sfdisk "/dev/${DISK}"
|
||||
fdisk -l "/dev/${DISK}"
|
||||
echo "Creating ext4 partition..."
|
||||
mkfs.ext4 "/dev/${DISK}1"
|
||||
DISK="${DISK}1"
|
||||
fi
|
||||
|
||||
# Mount the partition, move everything into /external
|
||||
mkdir -p /newroot
|
||||
mount -t ext4 "/dev/${DISK}" /newroot
|
||||
mkdir -p /newroot/external
|
||||
mv /newroot/* /newroot/external/ 2>/dev/null || true # obviously errors trying to move external into itself
|
||||
|
||||
# Switch root
|
||||
mkdir -p /rootonly
|
||||
# This doesn't recursively mount - that's why we're able to copy everything over
|
||||
mount --bind / /rootonly
|
||||
cp -ar /rootonly/* /newroot/
|
||||
umount /rootonly
|
||||
switch_root /newroot /init
|
||||
Loading…
Add table
Add a link
Reference in a new issue