Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by David Brown (ff3324221e262ea9502eddcc55853d417004cb08)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by David Brown (ff3324221e262ea9502eddcc55853d417004cb08)
  • Date: Mon, 26 Jun 2006 23:14:51 -0500

GIT changes to master sorcery by David Brown <dmlb2000 AT gmail.com>:

ChangeLog | 5 ++++
var/lib/sorcery/modules/libstage | 44
+++++++++++++++++++++++++++++++++------
2 files changed, 43 insertions(+), 6 deletions(-)

New commits:
commit ff3324221e262ea9502eddcc55853d417004cb08
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

added functions for block character and fifos making new files in the
system instead of moving them

diff --git a/ChangeLog b/ChangeLog
index 034fdf1..c19536c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
2006-06-26 David Brown <dmlb2000 AT gmail.com>
+ * libstage: added functions for installing block character
+ and fifos instead of moving them we make new ones in the
+ system
+
+2006-06-26 David Brown <dmlb2000 AT gmail.com>
* libstage: added function for pipes using mv instead of cp

2006-06-26 Andrew Stitt <astitt AT sourcemage.org>
diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index 0086f1a..8fdd6b3 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -131,24 +131,50 @@ function stage_install_symlink()
esac
}

-function stage_install_pipe()
+function stage_install_fifo()
{
local FILE=$1
local SAVE=$CONFIG_STAGE_DIRECTORY/$FILE.$(date +%Y%m%d%H%M%S)
- message "${FILE_COLOR}Symlink $FILE${DEFAULT_COLOR}"
+ message "${FILE_COLOR}Fifo $FILE${DEFAULT_COLOR}"
case $2 in
config)
if [[ -e "${INSTALL_ROOT}/$FILE" ]]
then
touch "${INSTALL_ROOT}/$FILE" &&
mkdir -p $(dirname $SAVE) &&
- mv "$STAGE_DIRECTORY/TRANSL/$FILE" "${INSTALL_ROOT}/$SAVE"
+ mkfifo "${INSTALL_ROOT}/$SAVE"
else
- mv "$STAGE_DIRECTORY/TRANSL/$FILE" "${INSTALL_ROOT}/$FILE"
+ mkfifo "${INSTALL_ROOT}/$FILE"
fi
;;
*)
- mv "$STAGE_DIRECTORY/TRANSL/$FILE" "${INSTALL_ROOT}/$FILE"
+ mkfifo "${INSTALL_ROOT}/$FILE"
+ ;;
+ esac
+}
+
+function stage_install_char_block()
+{
+ local FILE=$1
+ local PERMISSION=$(stat -c %a "${STAGE_DIRECTORY}/TRANSL/$FILE")
+ local MAJOR=$(stat -c %t "${STAGE_DIRECTORY}/TRANSL/$FILE")
+ local MINOR=$(stat -c %T "${STAGE_DIRECTORY}/TRANSL/$FILE")
+ local SAVE=$CONFIG_STAGE_DIRECTORY/$FILE.$(date +%Y%m%d%H%M%S)
+ local TYPE=$3
+ message "${FILE_COLOR}${PERMISSION} $TYPE $MAJOR $MINOR
$FILE${DEFAULT_COLOR}"
+ case $2 in
+ config)
+ if [[ -e "${INSTALL_ROOT}/$FILE" ]]
+ then
+ touch "${INSTALL_ROOT}/$FILE" &&
+ mkdir -p $(dirname $SAVE) &&
+ mknod -m "${PERMISSION}" "${INSTALL_ROOT}/$SAVE" "${TYPE}"
"${MAJOR}" "${MINOR}"
+ else
+ mknod -m "${PERMISSION}" "${INSTALL_ROOT}/$FILE" "${TYPE}"
"${MAJOR}" "${MINOR}"
+ fi
+ ;;
+ *)
+ mknod -m "${PERMISSION}" "${INSTALL_ROOT}/$FILE" "${TYPE}" "${MAJOR}"
"${MINOR}"
;;
esac
}
@@ -176,9 +202,15 @@ function stage_install_list()
if [[ -h $STAGE_DIRECTORY/TRANSL/$1 ]]
then
stage_install_symlink "$@"
+ elif [[ -b $STAGE_DIRECTORY/TRANSL/$1 ]]
+ then
+ stage_install_char_block "$@" b
+ elif [[ -c $STAGE_DIRECTORY/TRANSL/$1 ]]
+ then
+ stage_install_char_block "$@" c
elif [[ -p $STAGE_DIRECTORY/TRANSL/$1 ]]
then
- stage_install_pipe "$@"
+ stage_install_fifo "$@"
elif [[ ! -d $STAGE_DIRECTORY/TRANSL/$1 ]]
then
stage_install_file "$@"



  • [SM-Commit] GIT changes to master sorcery by David Brown (ff3324221e262ea9502eddcc55853d417004cb08), David Brown, 06/27/2006

Archive powered by MHonArc 2.6.24.

Top of Page