diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2010-08-14 21:12:05 -0400 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2010-08-14 21:12:05 -0400 |
commit | 5a69cb0659dae2bfb481c31a6c57ff4f829225ac (patch) | |
tree | 00f6cf60aa9c11a0972c1f970abc7e0edad5e40d /PCBSD/pc-sysinstall/backend-query/.svn/text-base | |
parent | 3fcc3999dacb8e92d22fa68922a0cb07141c481d (diff) | |
download | pfsense-5a69cb0659dae2bfb481c31a6c57ff4f829225ac.zip pfsense-5a69cb0659dae2bfb481c31a6c57ff4f829225ac.tar.gz |
Sync pc-sysinstall with FreeBSD-CURRENT and remove old /PCBSD version. Change installer.php to match new path
Diffstat (limited to 'PCBSD/pc-sysinstall/backend-query/.svn/text-base')
20 files changed, 0 insertions, 650 deletions
diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/detect-laptop.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/detect-laptop.sh.svn-base deleted file mode 100644 index bf42842..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/detect-laptop.sh.svn-base +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -dmesgLine=`dmesg | grep "acpi_acad0"` -if test "${dmesgLine}" = ""; then - echo "laptop: NO" -else - echo "laptop: YES" -fi diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/detect-nics.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/detect-nics.sh.svn-base deleted file mode 100644 index ead211d..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/detect-nics.sh.svn-base +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -rm /tmp/netCards 2>/dev/null -touch /tmp/netCards - -config="`ifconfig -l`" - -for i in $config -do - echo "${i}" | grep -e "lo0" -e "^fwe" -e "^fwip" -e "lo1" -e "^plip" -e "^pfsync" -e "^pflog" -e "^tun" >/dev/null 2>/dev/null - if [ "$?" != "0" ] - then - IDENT="<`dmesg | grep ^${i} | grep -v "miibus" | grep '<' | cut -d '<' -f 2 | cut -d '>' -f 1 | head -1`>" - echo "${i}: $IDENT" - fi -done diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/detect-vmware.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/detect-vmware.sh.svn-base deleted file mode 100644 index 74b32db..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/detect-vmware.sh.svn-base +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - - -pciconf -lv | grep -i vmware >/dev/null 2>/dev/null -if [ "$?" = "0" ] -then - echo "vmware: YES" - exit 0 -else - echo "vmware: NO" - exit 1 -fi diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/disk-info.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/disk-info.sh.svn-base deleted file mode 100644 index 1a4ca7e..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/disk-info.sh.svn-base +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# Query a disk for partitions and display them -############################# - -. ${PROGDIR}/backend/functions.sh -. ${PROGDIR}/backend/functions-disk.sh - -if [ -z "${1}" ] -then - echo "Error: No disk specified!" - exit 1 -fi - -if [ ! -e "/dev/${1}" ] -then - echo "Error: Disk /dev/${1} does not exist!" - exit 1 -fi - -DISK="${1}" - -get_disk_cyl "${DISK}" -CYLS="${VAL}" - -get_disk_heads "${DISK}" -HEADS="${VAL}" - -get_disk_sectors "${DISK}" -SECS="${VAL}" - -echo "cylinders=${CYLS}" -echo "heads=${HEADS}" -echo "sectors=${SECS}" - -# Now get the disks size in MB -KB="`diskinfo -v ${1} | grep 'bytes' | cut -d '#' -f 1 | tr -s '\t' ' ' | tr -d ' '`" -MB=$(convert_byte_to_megabyte ${KB}) -echo "size=$MB" - -# Now get the Controller Type -CTYPE="`dmesg | grep "^${1}:" | grep "B <" | cut -d '>' -f 2 | cut -d ' ' -f 3-10`" -echo "type=$CTYPE" diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/disk-list.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/disk-list.sh.svn-base deleted file mode 100644 index 4a17133..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/disk-list.sh.svn-base +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -# Create our device listing -SYSDISK=$(sysctl -n kern.disks) - -# Now loop through these devices, and list the disk drives -for i in ${SYSDISK} -do - - # Get the current device - DEV="${i}" - - # Make sure we don't find any cd devices - case "${DEV}" in - acd[0-9]*|cd[0-9]*|scd[0-9]*) continue ;; - esac - - # Check the dmesg output for some more info about this device - NEWLINE=$(dmesg | sed -n "s/^$DEV: .*<\(.*\)>.*$/ <\1>/p" | head -n 1) - if [ -z "$NEWLINE" ]; then - NEWLINE=" <Unknown Device>" - fi - - # Save the disk list - if [ ! -z "$DLIST" ] - then - DLIST="\n${DLIST}" - fi - - DLIST="${DEV}:${NEWLINE}${DLIST}" - -done - -# Echo out the found line -echo -e "$DLIST" | sort diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/disk-part.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/disk-part.sh.svn-base deleted file mode 100644 index ab78768..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/disk-part.sh.svn-base +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -# Query a disk for partitions and display them -############################# - -. ${PROGDIR}/backend/functions.sh -. ${PROGDIR}/backend/functions-disk.sh - -if [ -z "${1}" ] -then - echo "Error: No disk specified!" - exit 1 -fi - -if [ ! -e "/dev/${1}" ] -then - echo "Error: Disk /dev/${1} does not exist!" - exit 1 -fi - -DISK="${1}" - -# Now get the disks size in MB -KB="`diskinfo -v ${1} | grep 'bytes' | cut -d '#' -f 1 | tr -s '\t' ' ' | tr -d ' '`" -MB=$(convert_byte_to_megabyte ${KB}) -TOTALSIZE="$MB" -TOTALB="`diskinfo -v ${1} | grep 'in sectors' | tr -s '\t' ' ' | cut -d ' ' -f 2`" - - - -gpart show ${1} >/dev/null 2>/dev/null -if [ "$?" != "0" ] ; then - # No partitions on this disk, display entire disk size and exit - echo "${1}-freemb: ${TOTALSIZE}" - echo "${1}-freeblocks: ${TOTALB}" - exit -fi - -# Display if this is GPT or MBR formatted -gpart show ${1} | grep "GPT" >/dev/null 2>/dev/null -if [ "$?" = "0" ] ; then - echo "${1}-format: GPT" - TYPE="GPT" -else - echo "${1}-format: MBR" - TYPE="MBR" -fi - -# Set some search flags -PART="0" -EXTENDED="0" -START="0" -SIZEB="0" - -# Get a listing of partitions on this disk -get_disk_partitions "${DISK}" -PARTS="${VAL}" -for curpart in $PARTS -do - - # First get the sysid / label for this partition - if [ "$TYPE" = "MBR" ] ; then - get_partition_sysid_mbr "${DISK}" "${curpart}" - echo "${curpart}-sysid: ${VAL}" - get_partition_label_mbr "${DISK}" "${curpart}" - echo "${curpart}-label: ${VAL}" - else - get_partition_label_gpt "${DISK}" "${curpart}" - echo "${curpart}-sysid: ${VAL}" - echo "${curpart}-label: ${VAL}" - fi - - # Now get the startblock, blocksize and MB size of this partition - - get_partition_startblock "${DISK}" "${curpart}" - START="${VAL}" - echo "${curpart}-blockstart: ${START}" - - get_partition_blocksize "${DISK}" "${curpart}" - SIZEB="${VAL}" - echo "${curpart}-blocksize: ${SIZEB}" - - SIZEMB=$(convert_blocks_to_megabyte ${SIZEB}) - echo "${curpart}-sizemb: ${SIZEMB}" - -done - - -# Now calculate any free space -LASTB="`expr $SIZEB + $START`" -FREEB="`expr $TOTALB - $LASTB`" -FREEMB="`expr ${FREEB} / 2048`" -echo "${1}-freemb: $FREEMB" -echo "${1}-freeblocks: $FREEB" diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/enable-net.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/enable-net.sh.svn-base deleted file mode 100644 index ca3115d..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/enable-net.sh.svn-base +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# Script which enables networking with specified options -########################################################################### - -. ${PROGDIR}/backend/functions.sh -. ${PROGDIR}/conf/pc-sysinstall.conf -. ${BACKEND}/functions-networking.sh -. ${BACKEND}/functions-parse.sh - - -NIC="$1" -IP="$2" -NETMASK="$3" -DNS="$4" -GATEWAY="$5" -MIRRORFETCH="$6" - -if [ -z "${NIC}" ] -then - echo "ERROR: Usage enable-net <nic> <ip> <netmask> <dns> <gateway>" - exit 150 -fi - -if [ "$NIC" = "AUTO-DHCP" ] -then - enable_auto_dhcp -else - echo "Enabling NIC: $NIC" - ifconfig ${NIC} ${IP} ${NETMASK} - - echo "nameserver ${DNS}" >/etc/resolv.conf - - route add default ${GATE} -fi - -case ${MIRRORFETCH} in - ON|on|yes|YES) fetch -o /tmp/mirrors-list.txt ${MIRRORLIST} >/dev/null 2>/dev/null;; - *) ;; -esac diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/list-components.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/list-components.sh.svn-base deleted file mode 100644 index 6833dc7..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/list-components.sh.svn-base +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Script which lists the available components for this release -########################################################################### - -. ${PROGDIR}/backend/functions.sh - -echo "Available Components:" - -cd ${COMPDIR} -for i in `ls -d *` -do - if [ -e "${i}/component.cfg" -a -e "${i}/install.sh" -a -e "${i}/distfiles" ] - then - NAME="`grep 'name:' ${i}/component.cfg | cut -d ':' -f 2`" - DESC="`grep 'description:' ${i}/component.cfg | cut -d ':' -f 2`" - TYPE="`grep 'type:' ${i}/component.cfg | cut -d ':' -f 2`" - echo " " - echo "name: ${i}" - echo "desc:${DESC}" - echo "type:${TYPE}" - if [ -e "${i}/component.png" ] - then - echo "icon: ${COMPDIR}/${i}/component.png" - fi - fi - -done - diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/list-rsync-backups.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/list-rsync-backups.sh.svn-base deleted file mode 100644 index 6b32fb1..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/list-rsync-backups.sh.svn-base +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# Script which lists the backups present on a server -########################################################################### - -. ${PROGDIR}/backend/functions.sh - -SSHUSER=$1 -SSHHOST=$2 -SSHPORT=$3 - -if [ -z "${SSHHOST}" -o -z "${SSHPORT}" ] -then - echo "ERROR: Usage list-rsync-backups.sh <user> <host> <port>" - exit 150 -fi - -# Look for full-system backups, needs at minimum a kernel to be bootable -FINDCMD="find . -type d -maxdepth 6 -name 'kernel' | grep '/boot/kernel'" - -# Get a listing of the number of full backups saved -OLDBACKUPS=`ssh -o 'BatchMode=yes' -p ${SSHPORT} ${SSHUSER}@${SSHHOST} "${FINDCMD}"` -if [ "$?" = "0" ] -then - for i in ${OLDBACKUPS} - do - BACKPATH="`echo ${i} | sed 's|/boot/.*||g' | sed 's|^./||g'`" - if [ -z "${BACKLIST}" ] - then - BACKLIST="${BACKPATH}" - else - BACKLIST="${BACKLIST}:${BACKPATH}" - fi - done - - if [ -z "${BACKLIST}" ] - then - echo "NONE" - else - echo "$BACKLIST" - fi - -else - echo "FAILED" -fi diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/list-tzones.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/list-tzones.sh.svn-base deleted file mode 100644 index 38bae91..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/list-tzones.sh.svn-base +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -rm ${TMPDIR}/.tzonetmp >/dev/null 2>/dev/null - -# Backend script which lists all the available timezones for front-ends to display -while read line -do - echo "$line" | grep "^#" >/dev/null 2>/dev/null - if [ "$?" != "0" ] - then - echo "$line" | tr -s "\t" ":" | cut -d ":" -f 3-4 >>${TMPDIR}/.tzonetmp - fi -done < /usr/share/zoneinfo/zone.tab - -sort ${TMPDIR}/.tzonetmp -rm ${TMPDIR}/.tzonetmp >/dev/null 2>/dev/null - -exit 0 diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/query-langs.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/query-langs.sh.svn-base deleted file mode 100644 index 7951ca6f..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/query-langs.sh.svn-base +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -FOUND="0" - -cat ${PROGDIR}/conf/avail-langs - -exit 0 diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/send-logs.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/send-logs.sh.svn-base deleted file mode 100644 index c182b22..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/send-logs.sh.svn-base +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# Script which creates a gzipped log and optionally mails it to the specified address -############################################################################ - -. ${PROGDIR}/backend/functions.sh -. ${PROGDIR}/conf/pc-sysinstall.conf -. ${BACKEND}/functions-networking.sh -. ${BACKEND}/functions-parse.sh - -# Bring up all NICS under DHCP -enable_auto_dhcp - -MAILTO="$1" -MAILRESULT="0" - -# Set the location of our compressed log -TMPLOG="/tmp/pc-sysinstall.log" - -echo "# PC-SYSINSTALL LOG" >${TMPLOG} -cat ${LOGOUT} >> ${TMPLOG} - -# Check if we have a GUI generated install cfg -if [ -e "/tmp/sys-install.cfg" ] -then - echo "" >>${TMPLOG} - echo "# PC-SYSINSTALL CFG " >>${TMPLOG} - cat /tmp/sys-install.cfg >> ${TMPLOG} -fi - -# Save dmesg output -echo "" >>${TMPLOG} -echo "# DMESG OUTPUT " >>${TMPLOG} -dmesg >> ${TMPLOG} - -# Get gpart info on all disks -for i in `${PROGDIR}/pc-sysinstall disk-list | cut -d ':' -f 1` -do - echo "" >>${TMPLOG} - echo "# DISK INFO $i " >>${TMPLOG} - ls /dev/${i}* >>${TMPLOG} - gpart show ${i} >> ${TMPLOG} -done - -# Show Mounted volumes -echo "" >>${TMPLOG} -echo "# MOUNT OUTPUT " >>${TMPLOG} -mount >> ${TMPLOG} - -echo "Log file saved to ${TMPLOG}" -echo "Warning: This file will be lost once the system is rebooted." - -echo "Do you wish to view this logfile now? (Y/N)" -read tmp -if [ "$tmp" = "Y" -o "$tmp" = "y" ] -then - more ${TMPLOG} -fi diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/setup-ssh-keys.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/setup-ssh-keys.sh.svn-base deleted file mode 100644 index 9b09e99..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/setup-ssh-keys.sh.svn-base +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# Script which sets up password-less logins for ssh host -########################################################################### - -. ${PROGDIR}/backend/functions.sh - -SSHUSER=$1 -SSHHOST=$2 -SSHPORT=$3 - -if [ -z "${SSHUSER}" -o -z "${SSHHOST}" -o -z "${SSHPORT}" ] -then - echo "ERROR: Usage setup-ssh-keys <user> <host> <port>" - exit 150 -fi - -cd ~ - -echo "Preparing to setup SSH key authorization..." -echo "When prompted, enter your password for ${SSHUSER}@${SSHHOST}" - -if [ ! -e ".ssh/id_rsa.pub" ] -then - mkdir .ssh >/dev/null 2>/dev/null - ssh-keygen -q -t rsa -N '' -f .ssh/id_rsa - sleep 1 -fi - -if [ ! -e ".ssh/id_rsa.pub" ] -then - echo "ERROR: Failed creating .ssh/id_rsa.pub" - exit 150 -fi - -# Get the .pub key -PUBKEY="`cat .ssh/id_rsa.pub`" - -ssh -p ${SSHPORT} ${SSHUSER}@${SSHHOST} "mkdir .ssh ; echo $PUBKEY >> .ssh/authorized_keys; chmod 600 .ssh/authorized_keys ; echo $PUBKEY >> .ssh/authorized_keys2; chmod 600 .ssh/authorized_keys2" diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/sys-mem.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/sys-mem.sh.svn-base deleted file mode 100644 index f087621..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/sys-mem.sh.svn-base +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -MEM=`sysctl hw.realmem | sed "s|hw.realmem: ||g"` -MEM=`expr $MEM / 1024` -MEM=`expr $MEM / 1024` -echo $MEM diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/test-live.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/test-live.sh.svn-base deleted file mode 100644 index 67ec7a5..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/test-live.sh.svn-base +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# Script which checks if we are running from install media, or real system -############################################################################# - -dmesg | grep "md0: Preloaded image" >/dev/null 2>/dev/null -if [ "$?" = "0" ] -then - echo "INSTALL-MEDIA" - exit 0 -else - echo "REAL-DISK" - exit 1 -fi - diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/test-netup.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/test-netup.sh.svn-base deleted file mode 100644 index 666781d..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/test-netup.sh.svn-base +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# Script which tests "fetch" when using a network connection, and saves -# if we are using direct connect, or need FTP passive mode -############################################################################# - -rm ${TMPDIR}/.testftp >/dev/null 2>/dev/null - -ping -c 2 www.pcbsd.org >/dev/null 2>/dev/null -if [ "$?" = "0" ] -then - echo "ftp: Up" - exit 0 -fi - -ping -c 2 www.freebsd.org >/dev/null 2>/dev/null -if [ "$?" = "0" ] -then - echo "ftp: Up" - exit 0 -fi - -echo "ftp: Down" -exit 1 diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/update-part-list.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/update-part-list.sh.svn-base deleted file mode 100644 index 9e38b53..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/update-part-list.sh.svn-base +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh - -echo "Running: find-update-parts" >> ${LOGOUT} - -rm ${TMPDIR}/AvailUpgrades >/dev/null 2>/dev/null - -FSMNT="/mnt" - -# Get the freebsd version on this partition -get_fbsd_ver() { - - VER="`file ${FSMNT}/bin/sh | grep 'for FreeBSD' | sed 's|for FreeBSD |;|g' | cut -d ';' -f 2 | cut -d ',' -f 1`" - if [ "$?" = "0" ] ; then - file ${FSMNT}/bin/sh | grep '32-bit' >/dev/null 2>/dev/null - if [ "${?}" = "0" ] ; then - echo "${1}: FreeBSD ${VER} (32bit)" - else - echo "${1}: FreeBSD ${VER} (64bit)" - fi - fi - -} - -# Create our device listing -SYSDISK="`sysctl kern.disks | cut -d ':' -f 2 | sed 's/^[ \t]*//'`" -DEVS="" - -# Now loop through these devices, and list the disk drives -for i in ${SYSDISK} -do - - # Get the current device - DEV="${i}" - # Make sure we don't find any cd devices - echo "${DEV}" | grep -e "^acd[0-9]" -e "^cd[0-9]" -e "^scd[0-9]" >/dev/null 2>/dev/null - if [ "$?" != "0" ] ; then - DEVS="${DEVS} `ls /dev/${i}s*`" - fi - -done - -# Import any zpools -zpool import -a - -for i in $DEVS -do - if [ -e "${i}a.journal" ] ; then - mount ${i}a.journal ${FSMNT} >>${LOGOUT} 2>>${LOGOUT} - if [ "${?}" = "0" ] ; then - get_fbsd_ver ${i} - umount -f ${FSMNT} >/dev/null 2>/dev/null - fi - elif [ -e "${i}a" ] - then - mount ${i}a ${FSMNT} >>${LOGOUT} 2>>${LOGOUT} - if [ "${?}" = "0" ] ; then - get_fbsd_ver ${i} - umount -f ${FSMNT} >/dev/null 2>/dev/null - else - # Lets try ZFS of this device - ZNAME=`echo ${i} | cut -d '/' -f 3` - mount -t zfs ${ZNAME}a ${FSMNT} - if [ "${?}" = "0" ] ; then - get_fbsd_ver ${i} - umount -f ${FSMNT} >/dev/null 2>/dev/null - fi - fi - fi -done - -# Export all zpools again, so that we can overwrite these partitions potentially -#for i in `zpool list -H -o name` -#do -# zpool export -f ${i} -#done diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/xkeyboard-layouts.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/xkeyboard-layouts.sh.svn-base deleted file mode 100644 index b2b92f3..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/xkeyboard-layouts.sh.svn-base +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -FOUND="0" - -# Lets parse the xorg.list file, and see what layouts are supported -while read line -do - - if [ "$FOUND" = "1" -a ! -z "$line" ] - then - echo $line | grep '! ' >/dev/null 2>/dev/null - if [ "$?" = "0" ] - then - exit 0 - else - echo "$line" - fi - fi - - if [ "${FOUND}" = "0" ] - then - echo $line | grep '! layout' >/dev/null 2>/dev/null - if [ "$?" = "0" ] - then - FOUND="1" - fi - fi - -done < /usr/local/share/X11/xkb/rules/xorg.lst - -exit 0 diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/xkeyboard-models.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/xkeyboard-models.sh.svn-base deleted file mode 100644 index 0d72681..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/xkeyboard-models.sh.svn-base +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -FOUND="0" - -# Lets parse the xorg.list file, and see what models are supported -while read line -do - - if [ "$FOUND" = "1" -a ! -z "$line" ] - then - echo $line | grep '! ' >/dev/null 2>/dev/null - if [ "$?" = "0" ] - then - exit 0 - else - model="`echo $line | sed 's|(|[|g'`" - model="`echo $model | sed 's|)|]|g'`" - echo "$model" - fi - fi - - if [ "${FOUND}" = "0" ] - then - echo $line | grep '! model' >/dev/null 2>/dev/null - if [ "$?" = "0" ] - then - FOUND="1" - fi - fi - -done < /usr/local/share/X11/xkb/rules/xorg.lst - -exit 0 diff --git a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/xkeyboard-variants.sh.svn-base b/PCBSD/pc-sysinstall/backend-query/.svn/text-base/xkeyboard-variants.sh.svn-base deleted file mode 100644 index 3bf18d7..0000000 --- a/PCBSD/pc-sysinstall/backend-query/.svn/text-base/xkeyboard-variants.sh.svn-base +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -FOUND="0" - -# Lets parse the xorg.list file, and see what varients are supported -while read line -do - - if [ "$FOUND" = "1" -a ! -z "$line" ] - then - echo $line | grep '! ' >/dev/null 2>/dev/null - if [ "$?" = "0" ] - then - exit 0 - else - echo "$line" - fi - fi - - if [ "${FOUND}" = "0" ] - then - echo $line | grep '! variant' >/dev/null 2>/dev/null - if [ "$?" = "0" ] - then - FOUND="1" - fi - fi - -done < /usr/local/share/X11/xkb/rules/xorg.lst - -exit 0 |