diff --git a/makeanything.sh b/makeanything.sh index 74d7238..4ea6f98 100755 --- a/makeanything.sh +++ b/makeanything.sh @@ -124,7 +124,7 @@ $CHROOTCMD sed -i '/<\!-- GENERATED ICONLIST -->/r /tmp/jwm.iconlist' /etc/jwm/s message "correct file permissions" #$CHROOTCMD /usr/bin/chmod 440 /etc/sudoers || error -$CHROOTCMD /usr/bin/chmod 755 /root/nanodesk-installer.sh || error +$CHROOTCMD /usr/bin/chmod 755 /usr/sbin/nanodesk-installer || error $CHROOTCMD /usr/bin/chmod 755 /usr/bin/nanodesk || error $CHROOTCMD /usr/bin/chmod 755 /usr/bin/nanodesk-first-start || error diff --git a/nanodesk-files/etc/jwm/system.nanodesk.jwmrc b/nanodesk-files/etc/jwm/system.nanodesk.jwmrc index a38b4eb..b4d6bf4 100644 --- a/nanodesk-files/etc/jwm/system.nanodesk.jwmrc +++ b/nanodesk-files/etc/jwm/system.nanodesk.jwmrc @@ -45,28 +45,26 @@ - root:1 - - showdesktop - + root:1 + + showdesktop + + + exec:lxterminal + + exec:falkon + + exec:pcmanfm + + + + + + + + - - exec:lxterminal - - exec:falkon - - exec:pcmanfm - - - - - - - - - - - + diff --git a/nanodesk-files/root/nanodesk-installer.sh b/nanodesk-files/usr/sbin/nanodesk-installer similarity index 95% rename from nanodesk-files/root/nanodesk-installer.sh rename to nanodesk-files/usr/sbin/nanodesk-installer index 58b58c6..3a1c48b 100755 --- a/nanodesk-files/root/nanodesk-installer.sh +++ b/nanodesk-files/usr/sbin/nanodesk-installer @@ -49,11 +49,9 @@ error () { } finish () { - message "removing firststart dialoge from jwm config" - $CHROOTCMD /usr/bin/sed -i '/doc\/nanodesk\/welcome\/welcome\.html/d' /etc/jwm/system.jwmrc || error message "removing installer files from target" - $CHROOTCMD /usr/bin/rm -Rf /root/nanodesk-installer.sh || error + $CHROOTCMD /usr/bin/rm -Rf /usr/sbin/nanodesk-installer || error message "removing live-packages from target" $CHROOTCMD /usr/bin/apt -y purge 'live-boot*' 'live-tools*' diff --git a/nanodesk-files/usr/share/doc/nanodesk/welcome/welcome.md b/nanodesk-files/usr/share/doc/nanodesk/welcome/welcome.md index 168038b..c511c93 100644 --- a/nanodesk-files/usr/share/doc/nanodesk/welcome/welcome.md +++ b/nanodesk-files/usr/share/doc/nanodesk/welcome/welcome.md @@ -1,39 +1,35 @@ # Welcome to nanodesk +`nanodesk` is yet another leightweight Debian flavor/distribution, +that comes with the `jwm` window manager. -nanodesk is a debian base linux "distribution". I put distribution in "" -becuase it is just a minimal debian debootstrap installation, which you -can boot from a DVD or usb-stick and install it to disk, with well picked -packages I like and a customized jwm config. Taddaa - a new distribution. - - -Everything done with having the goal to consume as less ram as possible. - +This is just a fun project for learning purposes. ## install to disk You can install nanodesk to your harddrive. Before doing so, you have to get your drive partitioned and formated. -Partiotioning on an empty drive is simple, you need two partitions +Partitioning on an empty drive is simple, you need two partitions - partition1: ext4 , mainfilesystem. - partition2 (optional, but recommended): swap -You can use `gparted` or `fdisk` for this. Please read their manuals. +You can use `Menu -> System -> Gparted` or `fdisk` on the shell for this. +Please read their manuals. -This done, just run `sudo /root/nanodesk-installer.sh /dev/sdXY` from the terminal +This done, just run `sudo nanodesk-installer /dev/sdXY` from the terminal and the installation will start. (change /dev/sdXY to your drive) ## installing software -There is no GUI tool for installing software. You have to use `apt` from the -terminal. +There is `Menu -> System -> Synaptic` for installing software as GUI. +Alternatively you can use `apt` from the terminal. ## getting root -In the LiveCD mode you can just do `sudo su -` without being asked for a password. +When booting as livesystem, the default user is `debian` and the +password is `debian` as well. + Depending on your choice by the installation, you will have to enter a password, when you created your own using by the installer. - -So or so good old `su - ` works fine as well, just type in the root password.