Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

scripts: sync with master of: git://github.com/RobertCNelson/stable-k…

…ernel.git

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  • Loading branch information...
commit 97f79831f0fed39b178fcbb1e6eb9b01175fd591 1 parent aa7a0c0
@RobertCNelson authored
Showing with 48 additions and 22 deletions.
  1. +5 −1 repo_maintenance/push-sync-with-master.sh
  2. +43 −21 tools/host_det.sh
View
6 repo_maintenance/push-sync-with-master.sh
@@ -6,7 +6,11 @@ if [ -e ${DIR}/version.sh ]; then
unset BRANCH
. ${DIR}/version.sh
- git commit -a -m "scripts: sync with master" -s
+ if [ ! "${BRANCH}" ] ; then
+ BRANCH="master"
+ fi
+
+ git commit -a -m "scripts: sync with master of: git://github.com/RobertCNelson/stable-kernel.git" -s
git push origin ${BRANCH}
fi
View
64 tools/host_det.sh
@@ -58,7 +58,7 @@ redhat_reqs () {
fi
if [ "${rpm_pkgs}" ] ; then
- echo "Red Hat, or derivatives: missing dependicies, please install:"
+ echo "Red Hat, or derivatives: missing dependencies, please install:"
echo "-----------------------------"
echo "yum install ${rpm_pkgs}"
echo "-----------------------------"
@@ -144,18 +144,33 @@ debian_regs () {
unset stop_pkg_search
#lsb_release might not be installed...
if [ $(which lsb_release) ] ; then
- deb_distro=$(lsb_release -cs)
- deb_lsb_rs=$(lsb_release -rs | awk '{print $1}')
-
- #lsb_release -a
- #No LSB modules are available.
- #Distributor ID: Debian
- #Description: Debian GNU/Linux Kali Linux 1.0
- #Release: Kali Linux 1.0
- #Codename: n/a
- #http://docs.kali.org/kali-policy/kali-linux-relationship-with-debian
- if [ "x${deb_lsb_rs}" = "xKali" ] ; then
- deb_distro="wheezy"
+ deb_distro=$(lsb_release -cs | sed 's/\//_/g')
+
+ if [ "x${deb_distro}" = "xn_a" ] ; then
+ echo "+ Warning: [lsb_release -cs] just returned [n/a], so now testing [lsb_release -rs] instead..."
+ deb_lsb_rs=$(lsb_release -rs | awk '{print $1}' | sed 's/\//_/g')
+
+ #http://docs.kali.org/kali-policy/kali-linux-relationship-with-debian
+ #lsb_release -a
+ #No LSB modules are available.
+ #Distributor ID: Debian
+ #Description: Debian GNU/Linux Kali Linux 1.0
+ #Release: Kali Linux 1.0
+ #Codename: n/a
+ if [ "x${deb_lsb_rs}" = "xKali" ] ; then
+ deb_distro="wheezy"
+ fi
+
+ #Debian "testing"
+ #lsb_release -a
+ #No LSB modules are available.
+ #Distributor ID: Debian
+ #Description: Debian GNU/Linux testing/unstable
+ #Release: testing/unstable
+ #Codename: n/a
+ if [ "x${deb_lsb_rs}" = "xtesting_unstable" ] ; then
+ deb_distro="jessie"
+ fi
fi
#Linux Mint: Compatibility Matrix
@@ -189,24 +204,32 @@ debian_regs () {
case "${deb_distro}" in
squeeze|wheezy|jessie|sid)
+ #Supported Debian:
unset error_unknown_deb_distro
unset warn_eol_distro
;;
lucid|precise|quantal|raring|saucy)
+ #Supported Ubuntu:
unset error_unknown_deb_distro
unset warn_eol_distro
;;
- maverick|natty|oneiric)
- #lucid -> precise
- #http://us.archive.ubuntu.com/ubuntu/dists/
- #list: dists between LTS's...
+ oneiric)
+ #Old Ubuntu: between lts: lucid -> precise
+ #But still on: http://us.archive.ubuntu.com/ubuntu/dists/ (supported except for oneiric)
+ #in 'theory' could bring oneiric back, but no reason too at this point...
+ unset error_unknown_deb_distro
+ warn_eol_distro=1
+ stop_pkg_search=1
+ ;;
+ maverick|natty)
+ #Old Ubuntu: between lts: lucid -> precise
+ #removed from http://us.archive.ubuntu.com/ubuntu/dists/ thus unsupported...
unset error_unknown_deb_distro
warn_eol_distro=1
stop_pkg_search=1
;;
hardy)
- #Just old, but still on:
- #http://us.archive.ubuntu.com/ubuntu/dists/
+ #Old Ubuntu LTS: unsupported...
unset error_unknown_deb_distro
warn_eol_distro=1
stop_pkg_search=1
@@ -220,7 +243,6 @@ debian_regs () {
fi
if [ $(which lsb_release) ] && [ ! "${stop_pkg_search}" ] ; then
- deb_distro=$(lsb_release -cs)
deb_arch=$(LC_ALL=C dpkg --print-architecture)
#pkg: mkimage
@@ -300,7 +322,7 @@ debian_regs () {
fi
if [ "${deb_pkgs}" ] ; then
- echo "Debian/Ubuntu/Mint: missing dependicies, please install:"
+ echo "Debian/Ubuntu/Mint: missing dependencies, please install:"
echo "-----------------------------"
if [ "${warn_dpkg_ia32}" ] ; then
echo "sudo dpkg --add-architecture i386"
Please sign in to comment.
Something went wrong with that request. Please try again.