diff --git a/README.md b/README.md index 6170d72..8ed7cea 100644 --- a/README.md +++ b/README.md @@ -41,12 +41,12 @@ Usage This downloads the root file system tarball and creates two Devuan disk images: -1. devuan-ascii-c201-libre-16GB.img, a 16 GB image suitable for persistent installation; its size should be exactly the size of the internal SSD -2. devuan-ascii-c201-libre-2GB.img, a 2 GB image suitable for booting the laptop off USB +1. devuan-beowulf-c201-libre-16GB.img, a 16 GB image suitable for persistent installation; its size should be exactly the size of the internal SSD +2. devuan-beowulf-c201-libre-2GB.img, a 2 GB image suitable for booting the laptop off USB To produce a bootable media, write the 2 GB image to a flash drive (of at least 2 GB): - # dd if=$SOMEWHERE/devuan-ascii-c201-libre-2GB.img of=/dev/$DEVICE bs=50M + # dd if=$SOMEWHERE/devuan-beowulf-c201-libre-2GB.img of=/dev/$DEVICE bs=50M During the first boot, packages will be installed and configured. Once packages are configured, the login prompt will appear; the root password is blank. @@ -54,7 +54,7 @@ The 2 GB image (yes, the smaller one) contains the larger, 16 GB one under /. Th Persistent installation is performed using dd, too: - # dd if=/devuan-ascii-c201-libre-16GB.img of=/dev/mmcblk0 + # dd if=/devuan-beowulf-c201-libre-16GB.img of=/dev/mmcblk0 Graphical Desktop ================= diff --git a/ci/build_rootfs.sh b/ci/build_rootfs.sh index 7ddd80d..052d48e 100755 --- a/ci/build_rootfs.sh +++ b/ci/build_rootfs.sh @@ -21,7 +21,7 @@ [ ! -f hosts ] && wget -O- https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews/hosts | grep ^0\.0\.0\.0 | awk '{print $1" "$2}' | grep -F -v "0.0.0.0 0.0.0.0" > hosts -debootstrap --arch=armhf --foreign --variant=minbase --include=eudev,kmod,net-tools,inetutils-ping,traceroute,iproute2,isc-dhcp-client,wpasupplicant,iw,alsa-utils,cgpt,elvis-tiny,less,psmisc,netcat-traditional,ca-certificates,bzip2,xz-utils,unscd,dbus,dbus-x11,bluez,pulseaudio,pulseaudio-module-bluetooth,elogind,libpam-elogind,ntp,xserver-xorg-core,xserver-xorg-input-libinput,xserver-xorg-video-fbdev,libgl1-mesa-dri,xserver-xorg-input-synaptics,xinit,x11-xserver-utils,ratpoison,xbindkeys,xvkbd,rxvt-unicode,htop,firefox-esr,mupdf,locales,man-db,dmz-cursor-theme,apt-transport-https ascii devsus-rootfs http://packages.devuan.org/merged +debootstrap --arch=armhf --foreign --variant=minbase --include=eudev,kmod,net-tools,inetutils-ping,traceroute,iproute2,isc-dhcp-client,wpasupplicant,iw,alsa-utils,cgpt,elvis-tiny,less,psmisc,netcat-traditional,ca-certificates,bzip2,xz-utils,unscd,dbus,dbus-x11,bluez,pulseaudio,pulseaudio-module-bluetooth,elogind,libpam-elogind,ntp,xserver-xorg-core,xserver-xorg-input-libinput,xserver-xorg-video-fbdev,libgl1-mesa-dri,xserver-xorg-input-synaptics,xinit,x11-xserver-utils,ratpoison,xbindkeys,xvkbd,rxvt-unicode,htop,firefox-esr,mupdf,locales,man-db,dmz-cursor-theme,apt-transport-https beowulf devsus-rootfs http://packages.devuan.org/merged install -D -m 644 devsus/sources.list devsus-rootfs/opt/devsus/sources.list for i in 80disable-recommends 99-brightness.rules 98-mac.rules fstab .xbindkeysrc htoprc .Xresources .ratpoisonrc 99-hinting.conf index.theme devsus-settings.js devsus.cfg diff --git a/ci/build_templates.sh b/ci/build_templates.sh index b9bad36..26ff1e0 100755 --- a/ci/build_templates.sh +++ b/ci/build_templates.sh @@ -34,6 +34,6 @@ create_image() { } # create 2GB and 16GB images with the Chrome OS partition layout -create_image devuan-ascii-c201-libre-2GB.img 50M 40 -create_image devuan-ascii-c201-libre-16GB.img 512 30785536 -GZIP=-1 tar -cSzf devsus-templates.tar.gz devuan-ascii-c201-libre-2GB.img devuan-ascii-c201-libre-16GB.img +create_image devuan-beowulf-c201-libre-2GB.img 50M 40 +create_image devuan-beowulf-c201-libre-16GB.img 512 30785536 +GZIP=-1 tar -cSzf devsus-templates.tar.gz devuan-beowulf-c201-libre-2GB.img devuan-beowulf-c201-libre-16GB.img diff --git a/devsus.sh b/devsus.sh index d530093..9d84086 100755 --- a/devsus.sh +++ b/devsus.sh @@ -49,8 +49,8 @@ trap cleanup INT TERM EXIT # mount the / partition of both images off=$(((8192 + 65536) * 512)) -mount -o loop,noatime,offset=$off devuan-ascii-c201-libre-2GB.img $outmnt -mount -o loop,noatime,offset=$off devuan-ascii-c201-libre-16GB.img $inmnt +mount -o loop,noatime,offset=$off devuan-beowulf-c201-libre-2GB.img $outmnt +mount -o loop,noatime,offset=$off devuan-beowulf-c201-libre-16GB.img $inmnt # unpack Devuan for i in rootfs kernel firmware @@ -60,11 +60,11 @@ done cp -a $outmnt/* $inmnt/ # put the kernel in the kernel partition -dd if=$outmnt/boot/vmlinux.kpart of=devuan-ascii-c201-libre-2GB.img conv=notrunc seek=8192 -dd if=$outmnt/boot/vmlinux.kpart of=devuan-ascii-c201-libre-16GB.img conv=notrunc seek=8192 +dd if=$outmnt/boot/vmlinux.kpart of=devuan-beowulf-c201-libre-2GB.img conv=notrunc seek=8192 +dd if=$outmnt/boot/vmlinux.kpart of=devuan-beowulf-c201-libre-16GB.img conv=notrunc seek=8192 umount -l $inmnt rmdir $inmnt # put the 16GB image inside the 2GB one -cp -f --sparse=always devuan-ascii-c201-libre-16GB.img $outmnt/ +cp -f --sparse=always devuan-beowulf-c201-libre-16GB.img $outmnt/ diff --git a/devsus/sources.list b/devsus/sources.list index b794454..cf6e941 100644 --- a/devsus/sources.list +++ b/devsus/sources.list @@ -1,2 +1,2 @@ -deb https://pkgmaster.devuan.org/merged ascii main -deb https://pkgmaster.devuan.org/merged ascii-updates main +deb https://pkgmaster.devuan.org/merged beowulf main +deb https://pkgmaster.devuan.org/merged beowulf-updates main