From: Philippe Coval Date: Mon, 11 Aug 2014 08:36:00 +0000 (+0200) Subject: Make tizen generic (rename "ivi" by "scripts") X-Git-Tag: accepted/tizen/common/20140814.150828^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fadaptation%2Fsetup-scripts.git;a=commitdiff_plain;h=fc66f580643ea38a56a5e29ae49536381b86a73f Make tizen generic (rename "ivi" by "scripts") Bug-Tizen: TINF-650 Change-Id: I13a018d30cd42f5b67197a7c323acc96930832a3 Signed-off-by: Philippe Coval --- diff --git a/efi-environment b/efi-environment index d5105ab..8ac4eb0 100644 --- a/efi-environment +++ b/efi-environment @@ -1,9 +1,9 @@ -# This file can be used for testing setup-ivi-* scripts. This file corresponds +# This file can be used for testing setup-scripts-* scripts. This file corresponds # to an EFI boot image (boot partition has the EFS type GUID). Do the following # to start debugging # # mkdir /tmp/boot -# touch /tmp/boot/vmlinuz-3.12-x86-ivi +# touch /tmp/boot/vmlinuz-* # mkdir -p /tmp/usr/lib/gummiboot # touch /tmp/usr/lib/gummiboot/gummibootia32.efi # mkdir /tmp/etc diff --git a/installerfw-sh-functions b/installerfw-sh-functions index bee4a19..985904c 100644 --- a/installerfw-sh-functions +++ b/installerfw-sh-functions @@ -2,7 +2,7 @@ # Author: Artem Bityutskiy # License: GPLv2 -# This file contains common functions for setup-ivi-* programs +# This file contains common functions for setup-scripts-* programs # Own name __PROG="${PROG:-installerfw-sh-functions}" diff --git a/mbr-environment b/mbr-environment index ca1ea84..6bfcb4d 100644 --- a/mbr-environment +++ b/mbr-environment @@ -1,8 +1,8 @@ -# This file can be used for testing setup-ivi-* scripts. This file corresponds +# This file can be used for testing setup-scripts-* scripts. This file corresponds # to an MBR boot image. Do the following to start debugging: # # mkdir /tmp/boot -# touch /tmp/boot/vmlinux-3.12-x86-ivi +# touch /tmp/boot/vmlinux-* # mkdir -p /tmp/usr/share/syslinux/ # touch /tmp/usr/share/syslinux/gptmbr.bin # mkdir /tmp/etc diff --git a/packaging/setup-ivi.spec b/packaging/setup-ivi.spec deleted file mode 100644 index d9054e6..0000000 --- a/packaging/setup-ivi.spec +++ /dev/null @@ -1,117 +0,0 @@ -Name: setup-ivi -Version: 1.1 -Release: 0 -License: GPL-2.0 -Summary: Various early setup programs -Url: http://www.tizen.org -Group: System/Configuration -Source: %{name}_%{version}.tar.gz -Requires: /usr/bin/sed -Requires: /usr/bin/grep -Requires: /usr/bin/printf -Requires: /usr/bin/printenv -Requires: /usr/bin/sort -Requires: /usr/bin/tr -Requires: virtual-setup-ivi-bootloader -BuildArchitectures: noarch - -%package -n setup-gummiboot -Summary: Command-line tool for tweaking gummiboot configuration -Provides: virtual-setup-ivi-bootloader -Requires: %{name} -Requires: gummiboot - -%package -n setup-extlinux -Summary: Command-line tool for tweaking extlinux configuration -Provides: virtual-setup-ivi-bootloader -Requires: %{name} -Requires: syslinux-extlinux - -%package -n setup-ivi-clone -Summary: A tool for cloning a Tizen IVI system -Requires: %{name} -Requires: /usr/bin/mount -Requires: /usr/bin/udevadm -Requires: /usr/bin/uuidgen -Requires: /usr/bin/sync -Requires: /usr/bin/tail -Requires: systemd -Requires: gptfdisk -Requires: e2fsprogs -Requires: dosfstools -Requires: rsync - -%description -This package provides various early system setup programs - -%description -n setup-gummiboot -This package provides a command-line tool for changing the gummiboot bootloader -configuration files. - -%description -n setup-extlinux -This package provides a command-line tool for changing the extlinux bootloader -configuration file. - -%description -n setup-ivi-clone -This package provides a command line tool for cloning a Tizen IVI system to a -different disk. - -### -### PREP -### -%prep -%setup -q -n %{name}-%{version} - -%build - -### -### INSTALL -### -%install -install -d %{buildroot}/%{_sbindir} -install -d %{buildroot}/%{_prefix}/share/setup-ivi -install -d %{buildroot}/%{_unitdir} - -install -m755 setup-ivi-boot %{buildroot}/%{_sbindir} -install -m755 setup-ivi-fstab %{buildroot}/%{_sbindir} -install -m755 setup-ivi-bootloader-conf %{buildroot}/%{_sbindir} -install -m755 setup-ivi-clone %{buildroot}/%{_sbindir} -install -m755 setup-ivi-clone-service %{buildroot}/%{_sbindir} -install -m644 ivi-clone.service %{buildroot}/%{_unitdir} -install -m755 setup-gummiboot-conf %{buildroot}/%{_sbindir} -install -m755 setup-extlinux-conf %{buildroot}/%{_sbindir} -install -m644 setup-ivi-sh-functions %{buildroot}/%{_prefix}/share/setup-ivi -install -m644 installerfw-sh-functions %{buildroot}/%{_prefix}/share/setup-ivi - -### -### CLEAN -### -%clean -rm -rf %{buildroot} - -### -### FILES -### -%files -%defattr(-,root,root) -%{_sbindir}/setup-ivi-boot -%{_sbindir}/setup-ivi-fstab -%{_sbindir}/setup-ivi-bootloader-conf -%{_prefix}/share/setup-ivi/setup-ivi-sh-functions -%{_prefix}/share/setup-ivi/installerfw-sh-functions - -%files -n setup-gummiboot -%defattr(-,root,root) -%{_sbindir}/setup-gummiboot-conf - -%files -n setup-extlinux -%defattr(-,root,root) -%{_sbindir}/setup-extlinux-conf - -%files -n setup-ivi-clone -%defattr(-,root,root) -%{_sbindir}/setup-ivi-clone -%{_sbindir}/setup-ivi-clone-service -# Note, we do not need to run 'systemctl enable ivi-clone' for this one because -# it is activated by the 'systemd.unit=ivi-clone.service' kernel parameter. -%{_unitdir}/ivi-clone.service diff --git a/packaging/setup-ivi.changes b/packaging/setup-scripts.changes similarity index 100% rename from packaging/setup-ivi.changes rename to packaging/setup-scripts.changes diff --git a/packaging/setup-ivi.manifest b/packaging/setup-scripts.manifest similarity index 100% rename from packaging/setup-ivi.manifest rename to packaging/setup-scripts.manifest diff --git a/packaging/setup-scripts.spec b/packaging/setup-scripts.spec new file mode 100644 index 0000000..ec37bc7 --- /dev/null +++ b/packaging/setup-scripts.spec @@ -0,0 +1,121 @@ +Name: setup-scripts +Version: 1.1 +Release: 0 +License: GPL-2.0 +Summary: Various early setup programs +Url: http://www.tizen.org +Group: System/Configuration +Source: %{name}_%{version}.tar.gz +Provides: setup-ivi = %{version}-%{release} +Obsoletes: setup-ivi < %{version}-%{release} +Requires: /usr/bin/sed +Requires: /usr/bin/grep +Requires: /usr/bin/printf +Requires: /usr/bin/printenv +Requires: /usr/bin/sort +Requires: /usr/bin/tr +Requires: virtual-setup-scripts-bootloader +BuildArchitectures: noarch + +%package -n %{name}-gummiboot +Summary: Command-line tool for tweaking gummiboot configuration +Provides: virtual-%{name}-bootloader +Requires: %{name} = %{version}-%{release} +Requires: gummiboot + +%package -n %{name}-extlinux +Summary: Command-line tool for tweaking extlinux configuration +Provides: virtual-%{name}-bootloader +Requires: %{name} = %{version}-%{release} +Requires: syslinux-extlinux + +%package -n %{name}-clone +Summary: A tool for cloning a Tizen system +Provides: setup-ivi-clone = %{version}-%{release} +Obsoletes: setup-ivi-clone < %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Requires: /usr/bin/mount +Requires: /usr/bin/udevadm +Requires: /usr/bin/uuidgen +Requires: /usr/bin/sync +Requires: /usr/bin/tail +Requires: systemd +Requires: gptfdisk +Requires: e2fsprogs +Requires: dosfstools +Requires: rsync + +%description +This package provides various early system setup programs + +%description -n %{name}-gummiboot +This package provides a command-line tool for changing the gummiboot bootloader +configuration files. + +%description -n %{name}-extlinux +This package provides a command-line tool for changing the extlinux bootloader +configuration file. + +%description -n %{name}-clone +This package provides a command line tool for cloning a Tizen system to a +different disk. + +### +### PREP +### +%prep +%setup -q -n %{name}-%{version} + +%build + +### +### INSTALL +### +%install +install -d %{buildroot}/%{_sbindir} +install -d %{buildroot}/%{_prefix}/share/setup-scripts +install -d %{buildroot}/%{_unitdir} + +install -m755 setup-scripts-boot %{buildroot}/%{_sbindir} +install -m755 setup-scripts-fstab %{buildroot}/%{_sbindir} +install -m755 setup-scripts-bootloader-conf %{buildroot}/%{_sbindir} +install -m755 setup-scripts-clone %{buildroot}/%{_sbindir} +install -m755 setup-scripts-clone-service %{buildroot}/%{_sbindir} +install -m644 scripts-clone.service %{buildroot}/%{_unitdir} +install -m755 setup-gummiboot-conf %{buildroot}/%{_sbindir} +install -m755 setup-extlinux-conf %{buildroot}/%{_sbindir} +install -m644 setup-scripts-sh-functions %{buildroot}/%{_prefix}/share/setup-scripts +install -m644 installerfw-sh-functions %{buildroot}/%{_prefix}/share/setup-scripts + +### +### CLEAN +### +%clean +rm -rf %{buildroot} + +### +### FILES +### +%files +%defattr(-,root,root) +%{_sbindir}/setup-scripts-boot +%{_sbindir}/setup-scripts-fstab +%{_sbindir}/setup-scripts-bootloader-conf +%{_prefix}/share/setup-scripts/setup-scripts-sh-functions +%{_prefix}/share/setup-scripts/installerfw-sh-functions + +%files -n %{name}-gummiboot +%defattr(-,root,root) +%{_sbindir}/setup-gummiboot-conf + +%files -n %{name}-extlinux +%defattr(-,root,root) +%{_sbindir}/setup-extlinux-conf + +%files -n setup-scripts-clone +%defattr(-,root,root) +%{_sbindir}/setup-scripts-clone +%{_sbindir}/setup-scripts-clone-service +# Note, we do not need to run 'systemctl enable scripts-clone' for this one because +# it is activated by the 'systemd.unit=scripts-clone.service' kernel parameter. +%{_unitdir}/scripts-clone.service diff --git a/ivi-clone.service b/scripts-clone.service similarity index 50% rename from ivi-clone.service rename to scripts-clone.service index 10a8d6f..600c343 100644 --- a/ivi-clone.service +++ b/scripts-clone.service @@ -1,9 +1,9 @@ [Unit] -Description=Cloning of the Tizen IVI OS to a non-removable media +Description=Cloning of the Tizen OS to a non-removable media [Service] Type=oneshot StandardOutput=journal+console StandardInput=tty -ExecStart=/usr/sbin/setup-ivi-clone-service +ExecStart=/usr/sbin/setup-scripts-clone-service ExecStartPost=/usr/sbin/reboot diff --git a/setup-extlinux-conf b/setup-extlinux-conf index 4a45152..f06c95e 100755 --- a/setup-extlinux-conf +++ b/setup-extlinux-conf @@ -8,10 +8,10 @@ PROG="setup-extlinux-conf" VER="1.0" srcdir="$(readlink -ev -- ${0%/*})" -if [ -f "$srcdir/setup-ivi-sh-functions" ]; then - . "$srcdir/setup-ivi-sh-functions" +if [ -f "$srcdir/setup-scripts-sh-functions" ]; then + . "$srcdir/setup-scripts-sh-functions" else - . /usr/share/setup-ivi/setup-ivi-sh-functions + . /usr/share/setup-scripts/setup-scripts-sh-functions fi # This is a small trick which I use to make sure my scripts are portable - diff --git a/setup-gummiboot-conf b/setup-gummiboot-conf index 83f5719..8119f47 100755 --- a/setup-gummiboot-conf +++ b/setup-gummiboot-conf @@ -8,10 +8,10 @@ PROG="setup-gummiboot-conf" VER="1.0" srcdir="$(readlink -ev -- ${0%/*})" -if [ -f "$srcdir/setup-ivi-sh-functions" ]; then - . "$srcdir/setup-ivi-sh-functions" +if [ -f "$srcdir/setup-scripts-sh-functions" ]; then + . "$srcdir/setup-scripts-sh-functions" else - . /usr/share/setup-ivi/setup-ivi-sh-functions + . /usr/share/setup-scripts/setup-scripts-sh-functions fi # This is a small trick which I use to make sure my scripts are portable - diff --git a/setup-ivi-boot b/setup-scripts-boot similarity index 91% rename from setup-ivi-boot rename to setup-scripts-boot index 428443b..60b42f8 100755 --- a/setup-ivi-boot +++ b/setup-scripts-boot @@ -4,18 +4,18 @@ # Author: Artem Bityutskiy # License: GPLv2 -PROG="setup-ivi-boot" +PROG="setup-scripts-boot" VER="1.0" srcdir="$(readlink -ev -- ${0%/*})" -PATH="/usr/share/setup-ivi:$srcdir:$PATH" +PATH="/usr/share/setup-scripts:$srcdir:$PATH" -if [ -f "$srcdir/setup-ivi-sh-functions" ]; then - . "$srcdir/setup-ivi-sh-functions" +if [ -f "$srcdir/setup-scripts-sh-functions" ]; then + . "$srcdir/setup-scripts-sh-functions" . "$srcdir/installerfw-sh-functions" else - . /usr/share/setup-ivi/setup-ivi-sh-functions - . /usr/share/setup-ivi/installerfw-sh-functions + . /usr/share/setup-scripts/setup-scripts-sh-functions + . /usr/share/setup-scripts/installerfw-sh-functions fi # This is a small trick which I use to make sure my scripts are portable - @@ -173,12 +173,12 @@ kernels="$(ls -1 "$bootdir" | LC_ALL=C grep -- "^vmlinuz-" | sort -r)" fatal "no kernels (vmlinuz-*) found in \"$bootdir\"" printf "%s\n" "$kernels" | while IFS= read -r kernel; do - setup-ivi-bootloader-conf $verbose add --force "$kernel" + setup-scripts-bootloader-conf $verbose add --force "$kernel" done # Set the default kernel to the kernel with highest version newest_kernel="$(get_newest_kernel "$bootdir")" -setup-ivi-bootloader-conf $verbose default "$newest_kernel" +setup-scripts-bootloader-conf $verbose default "$newest_kernel" # And finally, create the /etc/fstab file -setup-ivi-fstab $verbose --force +setup-scripts-fstab $verbose --force diff --git a/setup-ivi-bootloader-conf b/setup-scripts-bootloader-conf similarity index 95% rename from setup-ivi-bootloader-conf rename to setup-scripts-bootloader-conf index 3403b6c..6c56f8b 100755 --- a/setup-ivi-bootloader-conf +++ b/setup-scripts-bootloader-conf @@ -4,18 +4,18 @@ # Author: Artem Bityutskiy # License: GPLv2 -PROG="setup-ivi-bootloader-conf" +PROG="setup-scripts-bootloader-conf" VER="1.0" srcdir="$(readlink -ev -- ${0%/*})" -PATH="/usr/share/setup-ivi:$srcdir:$PATH" +PATH="/usr/share/setup-scripts:$srcdir:$PATH" -if [ -f "$srcdir/setup-ivi-sh-functions" ]; then - . "$srcdir/setup-ivi-sh-functions" +if [ -f "$srcdir/setup-scripts-sh-functions" ]; then + . "$srcdir/setup-scripts-sh-functions" . "$srcdir/installerfw-sh-functions" else - . /usr/share/setup-ivi/setup-ivi-sh-functions - . /usr/share/setup-ivi/installerfw-sh-functions + . /usr/share/setup-scripts/setup-scripts-sh-functions + . /usr/share/setup-scripts/installerfw-sh-functions fi # This is a small trick which I use to make sure my scripts are portable - @@ -150,9 +150,9 @@ add_subcommand() # Add the clone bootloader entry, but only if the cloning tool is # installed - if [ -f "$rootdir/usr/sbin/setup-ivi-clone" ]; then - clone_opts="$options systemd.unit=ivi-clone.service" - clone_opts="$clone_opts ivi-clone-target=autodetect" + if [ -f "$rootdir/usr/sbin/setup-scripts-clone" ]; then + clone_opts="$options systemd.unit=scripts-clone.service" + clone_opts="$clone_opts scripts-clone-target=autodetect" setup-$boot-conf $verbose --bootdir "$bootdir" add \ $force "$kernel-clone" "Clone $os_name" \ "$kernel" "$clone_opts" @@ -380,7 +380,7 @@ show_usage() Usage: $PROG [options] [options] This program adds or removes a kernel to/from the bootloader configuration -file(s). This is a Tizen IVI-specific program and it currently supports only 2 +file(s). This is a Tizen specific program and it currently supports only 2 bootloader types - extlinux and gummiboot. Each new kernel gets 2 boot menu entries - the default and verbose, and both of these are removed by the "remove" subcommand. diff --git a/setup-ivi-clone b/setup-scripts-clone similarity index 95% rename from setup-ivi-clone rename to setup-scripts-clone index e36c313..193a0c2 100755 --- a/setup-ivi-clone +++ b/setup-scripts-clone @@ -4,17 +4,17 @@ # Author: Artem Bityutskiy # License: GPLv2 -PROG="setup-ivi-clone" +PROG="setup-scripts-clone" VER="1.0" srcdir="$(readlink -ev -- ${0%/*})" -if [ -f "$srcdir/setup-ivi-sh-functions" ]; then - . "$srcdir/setup-ivi-sh-functions" +if [ -f "$srcdir/setup-scripts-sh-functions" ]; then + . "$srcdir/setup-scripts-sh-functions" . "$srcdir/installerfw-sh-functions" else - . /usr/share/setup-ivi/setup-ivi-sh-functions - . /usr/share/setup-ivi/installerfw-sh-functions + . /usr/share/setup-scripts/setup-scripts-sh-functions + . /usr/share/setup-scripts/installerfw-sh-functions fi # This is a small trick which I use to make sure my scripts are portable - @@ -380,7 +380,7 @@ amend_installerfw_environment() # Check if the block device is mounted # TODO: the much better way to do this is to use the open(2) "O_EXCL" flag # which has special meaning for block devices. This would need to write a -# C helper program, something like setup-ivi-open-helper. +# C helper program, something like setup-scripts-open-helper. is_mounted() { local devnode="$(esc_regexp "$1")" @@ -393,7 +393,7 @@ show_usage() cat <<-EOF Usage: $PROG [options] -Clone a running Tizen IVI system to a different disk. The mandatory argument +Clone a running Tizen system to a different disk. The mandatory argument "" is the device node name to clone to (e.g., /dev/sda). Be careful, this program will destroy all the "" data! @@ -404,9 +404,9 @@ The program roughly works like this. 2. Partitions "" according to "/etc/installerfw-environment" (the last partition gets re-sized to consume all the space on ""). 3. Formats all the newly created partitions on "". -4. Copies all the data from the disk Tizen IVI currently runs from to +4. Copies all the data from the disk Tizen currently runs from to "", partition-by-partition. -5. Configures the cloned system on "" by "setup-ivi-boot". +5. Configures the cloned system on "" by "setup-scripts-boot". 6. Reboots the system. Options: @@ -492,7 +492,7 @@ if [ "$ptable_format" != "gpt" ]; then fatal "partition table type \"$ptable_format\" is not supported" fi -# Disable the Tizen IVI automount agent, otherwise it may start mounting the +# Disable the Tizen automount agent, otherwise it may start mounting the # $dstdisk partitions that we are going to create automount_status="$(systemctl --user is-active udisks-automount-agent 2>/dev/null ||:)" if [ "$automount_status" = "active" ]; then @@ -534,7 +534,7 @@ message "finished copying, configuring the cloned OS" amend_installerfw_environment # Configure the target system -$srcdir/setup-ivi-boot $verbose +$srcdir/setup-scripts-boot $verbose # Note, unmount happens in 'cleanup_handler()' message "done, synchronizing the data" diff --git a/setup-ivi-clone-service b/setup-scripts-clone-service similarity index 83% rename from setup-ivi-clone-service rename to setup-scripts-clone-service index 775f382..3702b28 100755 --- a/setup-ivi-clone-service +++ b/setup-scripts-clone-service @@ -4,18 +4,18 @@ # Author: Artem Bityutskiy # License: GPLv2 -PROG="setup-ivi-clone-service" +PROG="setup-scripts-clone-service" VER="1.0" srcdir="$(readlink -ev -- ${0%/*})" -PATH="/usr/share/setup-ivi:$srcdir:$PATH" +PATH="/usr/share/setup-scripts:$srcdir:$PATH" -if [ -f "$srcdir/setup-ivi-sh-functions" ]; then - . "$srcdir/setup-ivi-sh-functions" +if [ -f "$srcdir/setup-scripts-sh-functions" ]; then + . "$srcdir/setup-scripts-sh-functions" . "$srcdir/installerfw-sh-functions" else - . /usr/share/setup-ivi/setup-ivi-sh-functions - . /usr/share/setup-ivi/installerfw-sh-functions + . /usr/share/setup-scripts/setup-scripts-sh-functions + . /usr/share/setup-scripts/installerfw-sh-functions fi # This is a small trick which I use to make sure my scripts are portable - @@ -90,15 +90,15 @@ show_usage() cat <<-EOF Usage: $PROG [options] -This program is a wrapper over the 'setup-ivi-clone' program and it is intended +This program is a wrapper over the 'setup-scripts-clone' program and it is intended to be executed from a systemd service when the system boots up. By default, this program finds the first non-removable device in the system and -installs the OS there. However, if the 'ivi-clone-target=' kernel boot +installs the OS there. However, if the 'scripts-clone-target=' kernel boot option is present (see "/proc/cmdline"), then this program installs the OS to the disk represented by "" (e.g., "/dev/sda"). -The 'ivi-clone-target=autodetect' kernel option causes the default behaviour. +The 'scripts-clone-target=autodetect' kernel option causes the default behaviour. Options: -f, --force do not ask for confirmation, just proceed with cloning the OS @@ -153,7 +153,7 @@ done # last on the console. sleep 2 -devnode="$(sed -n -e "s/^.*ivi-clone-target=\([^ ]\+\).*$/\1/p" /proc/cmdline)" +devnode="$(sed -n -e "s/^.*scripts-clone-target=\([^ ]\+\).*$/\1/p" /proc/cmdline)" if [ -z "$devnode" ] || [ "$devnode" = "autodetect" ]; then devnode="$(find_an_internal_disk)" @@ -173,8 +173,8 @@ else disk_info="$devnode" fi -printf "%s\n" "cloning the Tizen IVI OS to \"$disk_info\"" +printf "%s\n" "cloning the Tizen OS to \"$disk_info\"" [ -z "$force" ] && get_confirmation printf "%s\n" "this may take a while, be patient" -setup-ivi-clone $verbose "$devnode" || fatal "failed to clone to $devnode" +setup-scripts-clone $verbose "$devnode" || fatal "failed to clone to $devnode" diff --git a/setup-ivi-fstab b/setup-scripts-fstab similarity index 89% rename from setup-ivi-fstab rename to setup-scripts-fstab index c130e5f..2f69579 100755 --- a/setup-ivi-fstab +++ b/setup-scripts-fstab @@ -4,18 +4,18 @@ # Author: Artem Bityutskiy # License: GPLv2 -PROG="setup-ivi-fstab" +PROG="setup-scripts-fstab" VER="1.0" srcdir="$(readlink -ev -- ${0%/*})" -PATH="/usr/share/setup-ivi:$srcdir:$PATH" +PATH="/usr/share/setup-scripts:$srcdir:$PATH" -if [ -f "$srcdir/setup-ivi-sh-functions" ]; then - . "$srcdir/setup-ivi-sh-functions" +if [ -f "$srcdir/setup-scripts-sh-functions" ]; then + . "$srcdir/setup-scripts-sh-functions" . "$srcdir/installerfw-sh-functions" else - . /usr/share/setup-ivi/setup-ivi-sh-functions - . /usr/share/setup-ivi/installerfw-sh-functions + . /usr/share/setup-scripts/setup-scripts-sh-functions + . /usr/share/setup-scripts/installerfw-sh-functions fi # This is a small trick which I use to make sure my scripts are portable - @@ -30,7 +30,7 @@ show_usage() cat <<-EOF Usage: $PROG [options] -Create the default Tizen IVI /etc/fstab file. +Create the default Tizen /etc/fstab file. Options: -f, --force re-write /etc/fstab if it exists diff --git a/setup-ivi-sh-functions b/setup-scripts-sh-functions similarity index 96% rename from setup-ivi-sh-functions rename to setup-scripts-sh-functions index f1aa2c6..7c0f239 100644 --- a/setup-ivi-sh-functions +++ b/setup-scripts-sh-functions @@ -2,10 +2,10 @@ # Author: Artem Bityutskiy # License: GPLv2 -# This file contains common functions for setup-ivi-* programs +# This file contains common functions for setup-scripts-* programs # Own name -__PROG="$PROG:-setup-ivi-sh-functions" +__PROG="$PROG:-setup-scripts-sh-functions" # Just a useful variable for the newline character(s) br="