diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | buildkernel.sh | 2 | ||||
| -rwxr-xr-x | mkramfs.sh | 3 | ||||
| -rw-r--r-- | sbin/init/init.c | 2 | ||||
| -rw-r--r-- | zshrc | 1 |
5 files changed, 8 insertions, 4 deletions
diff --git a/Makefile b/Makefile index f209851..dc62eca 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,8 @@ all: build_asmlib build_init build_shell build_fdmaker build_devscan if [ -d $$dir ]; then \ name=$$(basename $$dir); \ echo "Processing $$name $$dir/$$name.c"; \ - rm sbuild/sbin/$$name; \ - gcc -o ./sbuild/sbin/$$name $$dir/$$name.c -z noexecstack -static -march=x86-64; \ + rm build/sbin/$$name; \ + gcc -o ./build/sbin/$$name $$dir/$$name.c -z noexecstack -static -march=x86-64; \ fi \ done diff --git a/buildkernel.sh b/buildkernel.sh index aec236e..90cd239 100755 --- a/buildkernel.sh +++ b/buildkernel.sh @@ -41,5 +41,5 @@ make -j4 # make isoimage FDARGS="initrd=/init.cpio init=/sbin/init rdinit=/init root=/dev/root" FDINITRD=$INITPATH -j 6 cd .. cp -f kernel/arch/x86/boot/bzImage ./iso/boot/vmlinuz -cp -f ./init.cpio ./iso/boot/initramfs.cpio +cp -f ./init.cpio ./iso/boot/init.cpio grub-mkrescue -o nyaos.iso iso diff --git a/mkramfs.sh b/mkramfs.sh index 50392f0..ae568a1 100755 --- a/mkramfs.sh +++ b/mkramfs.sh @@ -22,6 +22,9 @@ echo "root:x:0:0::/root:/bin/shel" > initramfs/etc/passwd cat /etc/dhcpcd.conf > initramfs/etc/dhcpcd.conf mkdir initramfs/root cp zshrc initramfs/root/.zshrc +ln -s $PWD/initramfs/lib $PWD/initramfs/usr/lib +ln -s $PWD/initramfs/lib64 $PWD/initramfs/usr/lib64 +ln -s $PWD/initramfs/bin $PWD/initramfs/usr/bin cp -rf build/* initramfs/ # cp sbuild/* initramfs/sbin diff --git a/sbin/init/init.c b/sbin/init/init.c index 168d011..0cb1403 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -9,7 +9,7 @@ int main() { sigprocmask(SIG_BLOCK, &set, 0); if (fork()) pause(); //TODO - eventually add device scan - if (!fork()) execve("/sbin/devscan", 0, 0); + // if (!fork()) execve("/sbin/devscan", 0, 0); sigprocmask(SIG_UNBLOCK, &set, 0); diff --git a/zshrc b/zshrc new file mode 100644 index 0000000..4e493c0 --- /dev/null +++ b/zshrc @@ -0,0 +1 @@ +PS1="%n@%m $1~:" \ No newline at end of file |