summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2013-11-16 12:05:38 (GMT)
committer Jaromil <jaromil@dyne.org>2013-11-16 12:05:38 (GMT)
commit20bae00a7690f6f05c55a08fee13b44f44b82ff4 (patch)
tree38b47f1a4f2ce219aa486dc2ab8283a41f59caf1
parent1a023e964e1bd47f257b8adfb74c686a60aca56c (diff)
updates to system configuration (removed obsolete stuff)
-rw-r--r--build/system/Sources4
-rw-r--r--build/system/conf.zsh1
-rwxr-xr-xbuild/system/etc/init.d/sshd16
-rwxr-xr-xbuild/system/etc/zlogin18
4 files changed, 9 insertions, 30 deletions
diff --git a/build/system/Sources b/build/system/Sources
index fcfe8fa..24aedeb 100644
--- a/build/system/Sources
+++ b/build/system/Sources
@@ -2,7 +2,7 @@
zlib -1.2.5 .tar.gz http://www.gnu.org
ncurses -5.9 .tar.gz
-slang -2.2.4 .tar.bz2 http://www.jedsoft.org/slang/
+slang -2.2.4 .tar.bz2 http://www.jedsoft.org/slang
zsh -4.3.15 .tar.bz2 http://www.zsh.org
sed -4.2.1 .tar.bz2 http://www.gnu.org
gawk -4.0.0 .tar.bz2 http://www.gnu.org
@@ -10,7 +10,7 @@ grep -2.9 .tar.gz http://www.gnu.org
diffutils -3.2 .tar.gz http://www.gnu.org
file -5.11 .tar.gz
less -451 .tar.gz
-most -5.0.0a .tar.bz2 http://www.jedsoft.org/slang/
+most -5.0.0a .tar.bz2 http://www.jedsoft.org/slang
htop -1.0 .tar.gz
nano -2.2.6 .tar.gz
wipe -2.3.1 .tar.bz2
diff --git a/build/system/conf.zsh b/build/system/conf.zsh
index 157b272..5a10353 100644
--- a/build/system/conf.zsh
+++ b/build/system/conf.zsh
@@ -109,6 +109,7 @@ compile wipe default
act "Wipe installed."
}
+
## libevent
#compile libevent default
#zinstall libevent
diff --git a/build/system/etc/init.d/sshd b/build/system/etc/init.d/sshd
deleted file mode 100755
index 48d1f6a..0000000
--- a/build/system/etc/init.d/sshd
+++ /dev/null
@@ -1,16 +0,0 @@
-#!env zsh
-
-#+ service ssh
-#+ desc Secure shell
-#+ port 2222
-#+ proc dropbear
-#+ conf etc/ssh
-
-host_RSA=$SYS/etc/ssh/ssh_host_rsa_key
-
-{ test ! -r $SYS/etc/ssh/ssh_host_rsa_key } && {
- echo "Generating host RSA key..."
- dropbearkey -t rsa -f $host_RSA }
-
-dropbear -r $host_RSA -E -p 2222 -P $SYS/var/ssh/dropbear.pid
-
diff --git a/build/system/etc/zlogin b/build/system/etc/zlogin
index ba6f095..efe364d 100755
--- a/build/system/etc/zlogin
+++ b/build/system/etc/zlogin
@@ -1,21 +1,15 @@
#!env sh
# ZShaolin initialization
-# detect if we are running in a debugging mode from zmake
-# if yes, set to use system-wide zsh binary on dev machine
-if ! [ -z $ZHOME ]; then
- export HOME=$ZHOME/sysroot
-else
- export HOME=/data/data/org.dyne.zshaolin/files
- export SYS=$HOME/system
- export PATH=$SYS/bin:$SYS/sbin:$SYS/busybox/bin:$SYS/busybox/sbin:/system/xbin:$PATH
- export SHELL="$SYS/bin/zsh"
-fi
-
+export HOME=/data/data/org.dyne.zshaolin/files
+export SYS=$HOME/system
+export PATH=$SYS/bin:$SYS/sbin:$SYS/busybox/bin:$SYS/busybox/sbin:/system/xbin:$PATH
+export SHELL="$SYS/bin/zsh"
+export TMPDIR=$ZHOME/tmp
export MANPATH=$SYS/share/man
export MANPAGER=most
export TERMINFO=$SYS/share/terminfo
-export TERM=xterm
+export TERM=linux
cd $HOME
echo "Welcome to ZShaolin"