Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cmds] Fix sys and makeboot to copy /bootopts and updated required files #2066

Merged
merged 1 commit into from
Oct 7, 2024
Merged

[cmds] Fix sys and makeboot to copy /bootopts and updated required files #2066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions elkscmd/rootfs_template/bin/sys
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
# sys - create bootable system
#
#set -x

usage()
{
echo "Usage: sys [-3][-M][-F] /dev/{fd0,fd1,hda1,hda2,etc}"
echo "Usage: sys [-3][-M][-F] /dev/{fd0,fd1,hda1,hda2}"
echo " -3 Build minimal (360k) system"
echo " -M add MBR to target device"
echo " -F required for flat non-MBR /dev/hd[a-d]"
echo " -F create flat non-MBR /dev/hd[a-d]"
exit 1
}

create_dev_dir()
{
echo "Creating /dev entries..."
echo "Create /dev"
mkdir $MNT/dev
mknod $MNT/dev/hda b 3 0
mknod $MNT/dev/hda1 b 3 1
Expand Down Expand Up @@ -41,7 +39,6 @@ create_dev_dir()
mknod $MNT/dev/tty c 4 255
chmod 0666 $MNT/dev/tty
if test "$small" = "1"; then return; fi

mknod $MNT/dev/hdb b 3 8
mknod $MNT/dev/hdb1 b 3 9
mknod $MNT/dev/hdb2 b 3 10
Expand All @@ -66,7 +63,6 @@ create_dev_dir()

create_directories()
{
echo "Creating directories"
mkdir $MNT/bin
mkdir $MNT/etc
mkdir $MNT/mnt
Expand All @@ -76,11 +72,14 @@ create_directories()

copy_bin_files()
{
echo "Copying files from /bin..."
echo "Copy /bin"
if test "$small" = "1"; then
cp /bin/sh $MNT/bin
cp /bin/cat $MNT/bin
cp /bin/clock $MNT/bin
cp /bin/chmod $MNT/bin
cp /bin/cp $MNT/bin
cp /bin/date $MNT/bin
cp /bin/df $MNT/bin
cp /bin/echo $MNT/bin
cp /bin/fdisk $MNT/bin
Expand All @@ -99,19 +98,20 @@ copy_bin_files()
cp /bin/printenv $MNT/bin
cp /bin/ps $MNT/bin
cp /bin/pwd $MNT/bin
cp /bin/reboot $MNT/bin
cp /bin/shutdown $MNT/bin
cp /bin/rm $MNT/bin
cp /bin/sync $MNT/bin
cp /bin/sys $MNT/bin
cp /bin/umount $MNT/bin
cp /bin/uname $MNT/bin
else
cp -fR /bin $MNT/bin
fi
}

copy_etc_files()
{
echo "Copy files from /etc..."
echo "Copy /etc"
cp /etc/* $MNT/etc
}

Expand All @@ -134,11 +134,8 @@ mount $1 $MNT

# if MINIX, create /dev entries
if test "$FSTYPE" = "1"; then create_dev_dir; fi

create_directories

copy_bin_files

copy_etc_files

sync
Expand Down
7 changes: 3 additions & 4 deletions elkscmd/sys_utils/makeboot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#define MOUNTDIR "/tmp/mnt"

#define SYSFILE1 "/linux" /* copied for MINIX and FAT*/
#define SYSFILE2 "/bootopts" /* copied for MINIX only */
#define SYSFILE2 "/bootopts" /* copied for MINIX and FAT */
#define DEVDIR "/dev" /* created for FAT only */

/* BIOS driver numbers must match bioshd.c*/
Expand Down Expand Up @@ -458,13 +458,12 @@ int main(int ac, char **av)
fprintf(stderr, "Error copying %s\n", SYSFILE1);
goto errout;
}
if (!copyfile(SYSFILE2, MOUNTDIR SYSFILE2, 1))
fprintf(stderr, "Not copying %s file\n", SYSFILE2);

if (fstype == FST_MSDOS) {
if (mkdir(MOUNTDIR DEVDIR, 0777) < 0)
fprintf(stderr, "/dev directory may already exist on target\n");
} else {
if (!copyfile(SYSFILE2, MOUNTDIR SYSFILE2, 1))
fprintf(stderr, "Not copying %s file\n", SYSFILE2);
}

if (umount(targetdevice) < 0)
Expand Down
Loading