Skip to content

Commit

Permalink
Enable rumpdisk by default
Browse files Browse the repository at this point in the history
  • Loading branch information
flavioc committed Jan 16, 2024
1 parent 6ad2c3e commit 9c3c0a9
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
4 changes: 2 additions & 2 deletions create-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
LOOP=$(sudo losetup -f)
LOOPPART="${LOOP}p1"
IMG=hd.img
IMG_SIZE=2048MB
IMG_SIZE=10GB
BASE_SYS_ROOT=$(basename $SYS_ROOT)

create_image () {
Expand All @@ -31,7 +31,7 @@ copy_files () {
print_info "Copying system into mount..."
mkdir -p mount/{etc,boot,dev,usr,hurd,servers,lib,libexec,proc,sbin,bin,var,root,tools} &&
mkdir -p mount/var/{run,lib} &&
mkdir -p mount/servers/socket &&
mkdir -p mount/servers/{socket,bus} &&
cp -R files/etc/* mount/etc/ &&
mkdir -p mount/etc/hurd &&
cp files/runsystem.hurd mount/libexec/ &&
Expand Down
4 changes: 3 additions & 1 deletion files/SETUP
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ fsysopts / --writable
/bin/settrans -c /servers/socket/local /hurd/pflocal
/bin/settrans -c /servers/crash /hurd/crash
/bin/settrans -c /servers/password /hurd/password
/bin/settrans -c /servers/acpi /hurd/acpi
/bin/settrans -c /servers/bus/pci /hurd/pci-arbiter

# Setup crucial devices
cd /dev
rm -f console
/bin/bash /sbin/MAKEDEV console std hd0s1 tty1 tty2 tty3 tty4 tty5 tty6
/bin/bash /sbin/MAKEDEV console std hd0 hd0s1 sd0 rumpdisk wd0 wd0s1 tty1 tty2 tty3 tty4 tty5 tty6
set +v

# if test "$BOOT_DEV" && /bin/sh ./MAKEDEV "$BOOT_DEV"; then
Expand Down
9 changes: 7 additions & 2 deletions files/boot/grub.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,21 @@ set timeout=1
menuentry 'GNU' {
set root='hd0,msdos1'
echo 'Loading GNU Mach'
multiboot /boot/gnumach.gz root=device:hd0s1 -s
multiboot /boot/gnumach.gz root=part:1:device:wd0 noide
insmod part_msdos
insmod ext2
set root='hd0,msdos1'
echo 'Loading the Hurd ...'
module /hurd/pci-arbiter.static pci-arbiter \
--host-priv-port='${host-port}' --device-master-port='${device-port}' \
--next-task='${acpi-task}' \
'$(pci-task=task-create)' '$(task-resume)'
module /hurd/acpi.static acpi \
--next-task='${fs-task}' \
--next-task='${disk-task}' \
'$(acpi-task=task-create)'
module /hurd/rumpdisk.static rumpdisk \
--next-task='${fs-task}' \
'$(disk-task=task-create)'
module /hurd/ext2fs.static ext2fs \
--multiboot-command-line='${kernel-command-line}' \
--exec-server-task='${exec-task}' -T typed '${root}' \
Expand Down
2 changes: 1 addition & 1 deletion files/etc/fstab
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/dev/hd0s1 / ext2 defaults 0 1
/dev/wd0s1 / ext2 defaults 0 1
2 changes: 1 addition & 1 deletion files/etc/mtab
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/dev/hd0s1 / ext2fs writable,no-inherit-dir-group,store-type=typed 0 0
/dev/wd0s1 / ext2fs writable,no-inherit-dir-group,store-type=typed 0 0
none /run /hurd/tmpfs writable,no-suid,no-exec,no-inherit-dir-group,no-sync,size=187152K 0 0
none /run/lock /hurd/tmpfs writable,no-suid,no-exec,no-inherit-dir-group,no-sync,size=5M 0 0
none /run/shm /hurd/tmpfs writable,no-suid,no-exec,no-inherit-dir-group,no-sync,size=415520K 0 0

0 comments on commit 9c3c0a9

Please sign in to comment.