diff options
| author | Sebastian Schmelzer | 2010-09-17 12:31:11 +0200 |
|---|---|---|
| committer | Sebastian Schmelzer | 2010-09-17 12:31:11 +0200 |
| commit | e799bece29b804b2ce8db3a339682801acfc3109 (patch) | |
| tree | 3659844f7b891a9bfa6e332d4467c1d091d7b01b /tools | |
| parent | update version (diff) | |
| download | core-e799bece29b804b2ce8db3a339682801acfc3109.tar.gz core-e799bece29b804b2ce8db3a339682801acfc3109.tar.xz core-e799bece29b804b2ce8db3a339682801acfc3109.zip | |
fix for slxconfig-demuxer error
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/files.share | 3 | ||||
| -rwxr-xr-x | tools/installer | 19 |
2 files changed, 20 insertions, 2 deletions
diff --git a/tools/inc/files.share b/tools/inc/files.share index ede02d08..da5c7302 100644 --- a/tools/inc/files.share +++ b/tools/inc/files.share @@ -1,5 +1,6 @@ d initramfs/stage3-stuff /share/initramfs/ -d initramfs/tools /share/ramfstools/ +d initramfs/tools/hwinfo /share/ramfstools/ +d initramfs/tools/mksquashfs /share/ramfstools/ d initramfs/distro-specs /share/ d initramfs/uclib-rootfs /share/ d boot-env /share/ diff --git a/tools/installer b/tools/installer index 6989f7e9..9345c31b 100755 --- a/tools/installer +++ b/tools/installer @@ -28,7 +28,7 @@ git_version() GITVERSION=`git describe` GITMODIFIED=`(git status | grep "modified:\|added:\|deleted:" -q) && echo "-M"` echo $GITVERSION$GITMODIFIED - echo $GITVERSION > VERSION + [ -w VERSION -o ! -e VERSION ] && echo $GITVERSION > VERSION else cat VERSION fi @@ -513,6 +513,20 @@ build_rpm_package() rm -rf $SLX_RPMBUILD_PATH } + +cleanup_tmpfiles() +{ + rm -f openslx-*.tar + rm -rf _install +} + +check_permissions() +{ + if [ ! "x$(whoami)" = "xroot" ]; then + echo "You need to be root to run installer.." + exit 1 + fi +} clean() { @@ -596,6 +610,7 @@ cmd_mrproper() print_banner +check_permissions versions_update @@ -629,6 +644,8 @@ case "$1" in ;; esac +cleanup_tmpfiles + #make_install_tarball #make_install_tarball gzip #make_install_tarball bzip2 |