# HG changeset patch # User Aleksej Bobylev # Date 1505169251 -10800 # Node ID e44a1a92452b17f7d306b5b1c55669737d433b73 # Parent 9bfc85b0324c7b449ae79661ee84cea085f878af Up eudev, make-slitaz-icons, ntfs-3g, pcmanfm, polkit, slitaz-base-files, slitaz-boot-scripts, slitaz-icons-paper. diff -r 9bfc85b0324c -r e44a1a92452b eudev/receipt --- a/eudev/receipt Fri Sep 08 15:20:22 2017 +0300 +++ b/eudev/receipt Tue Sep 12 01:34:11 2017 +0300 @@ -7,6 +7,7 @@ MAINTAINER="tcg.thegamer@gmail.com" LICENSE="GPL2" WEB_SITE="http://dev.gentoo.org/~blueness/eudev/" +LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/eudev.html" PROVIDE="udev" TARBALL="$PACKAGE-$VERSION.tar.gz" @@ -42,9 +43,10 @@ make && make install - mkdir -p $install/etc/udev - cp $stuff/udev.conf $install/etc/udev cp $stuff/*.rules $install/etc/udev/rules.d + cp $stuff/udev/* $install/lib/udev + + mkdir -p "$install/lib/firmware" # https://docs.oracle.com/cd/E37670_01/E41138/html/ch07s03.html # /lib/udev/rules.d : default rules files. Do not edit these files. @@ -67,10 +69,7 @@ esac } -post_install_eudev() -{ - mkdir -p "$1/lib/firmware" - +post_install_eudev() { # Create some devices and directories that Udev cannot handle # due to them being required very early in the boot process mkdir -p "$1/lib/udev/devices/pts" @@ -80,13 +79,13 @@ # Sanity check for udev+ldap boot grep GROUP "$1"/etc/udev/rules.d/* "$1"/lib/udev/rules.d/* 2>/dev/null | \ sed 's/.*GROUP="\([a-zA-Z0-9]*\)".*/\1/' | sort | uniq | \ - while read x ; do + while read x; do grep -q ^$x: "$1/etc/group" || chroot "$1/" addgroup -S $x done grep OWNER "$1"/etc/udev/rules.d/* "$1"/lib/udev/rules.d/* 2>/dev/null | \ sed 's/.*OWNER="\([a-zA-Z0-9]*\)".*/\1/' | sort | uniq | \ - while read x ; do + while read x; do grep -q ^$x: "$1/etc/passwd" || chroot "$1/" adduser -S -D -H $x done } diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/40-alsa.rules --- a/eudev/stuff/40-alsa.rules Fri Sep 08 15:20:22 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -# do not edit this file, it will be overwritten on update - -SUBSYSTEM=="sound", GROUP="audio" -KERNEL=="controlC[0-9]*", NAME="snd/%k" -KERNEL=="hwC[D0-9]*", NAME="snd/%k" -KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" -KERNEL=="midiC[D0-9]*", NAME="snd/%k" -KERNEL=="timer", NAME="snd/%k" -KERNEL=="seq", NAME="snd/%k" -KERNEL=="mixer0", SYMLINK+="mixer" diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/45-usb.rules --- a/eudev/stuff/45-usb.rules Fri Sep 08 15:20:22 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -# usb devices -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE:="0666" -SUBSYSTEM=="usb_device",MODE:="0666" diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/55-lfs.rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eudev/stuff/55-lfs.rules Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,14 @@ +# /etc/udev/rules.d/55-lfs.rules: Rule definitions for LFS. + +# Core kernel devices + +# This causes the system clock to be set as soon as /dev/rtc becomes available. +#SUBSYSTEM=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/rc.d/init.d/setclock start" +#KERNEL=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/rc.d/init.d/setclock start" + +# Comms devices + +KERNEL=="ippp[0-9]*", GROUP="dialout" +KERNEL=="isdn[0-9]*", GROUP="dialout" +KERNEL=="isdnctrl[0-9]*", GROUP="dialout" +KERNEL=="dcbri[0-9]*", GROUP="dialout" diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/81-cdrom.rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eudev/stuff/81-cdrom.rules Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,3 @@ +# /etc/udev/rules.d/81-cdrom.rules: Set CD-ROM permissions and get device capabilities + +ACTION=="add", SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", IMPORT{program}="cdrom_id --export $tempnode", GROUP="cdrom" diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/83-cdrom-symlinks.rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eudev/stuff/83-cdrom-symlinks.rules Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,13 @@ +# /etc/udev/rules.d/83-cdrom-symlinks.rules: Determine CD drive capability. + +ACTION!="add", GOTO="cd_aliases_generator_end" +SUBSYSTEM!="block", GOTO="cd_aliases_generator_end" +ENV{GENERATED}=="?*", GOTO="cd_aliases_generator_end" + +# Fail the uevent if the autogenerated rules cannot be saved +ENV{ID_CDROM}=="?*", PROGRAM="/bin/grep -c ' / [^[:space:]]* rw' /proc/mounts", \ + RESULT!="2", RUN+="/bin/false", GOTO="cd_aliases_generator_end" + +ENV{ID_CDROM}=="?*", PROGRAM="write_cd_rules", SYMLINK+="%c" + +LABEL="cd_aliases_generator_end" diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/90-permissions.rules --- a/eudev/stuff/90-permissions.rules Fri Sep 08 15:20:22 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - -# sound devices -SUBSYSTEM=="sound",GROUP="audio" -SUBSYSTEM=="sound",MODE="0664" - -# storage -SUBSYSTEM=="ide",GROUP="root" -SUBSYSTEM=="ide",MODE="0660" -SUBSYSTEM=="ata",GROUP="root" -SUBSYSTEM=="ata",MODE="0660" -SUBSYSTEM=="scsi",GROUP="root" -SUBSYSTEM=="scsi",MODE="0660" diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/92-hal.rules --- a/eudev/stuff/92-hal.rules Fri Sep 08 15:20:22 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -# pass all events to hal daemon -#RUN+="socket:@/org/freedesktop/hal/udev_event" diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/oldstuff/40-alsa.rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eudev/stuff/oldstuff/40-alsa.rules Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,10 @@ +# do not edit this file, it will be overwritten on update + +SUBSYSTEM=="sound", GROUP="audio" +KERNEL=="controlC[0-9]*", NAME="snd/%k" +KERNEL=="hwC[D0-9]*", NAME="snd/%k" +KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" +KERNEL=="midiC[D0-9]*", NAME="snd/%k" +KERNEL=="timer", NAME="snd/%k" +KERNEL=="seq", NAME="snd/%k" +KERNEL=="mixer0", SYMLINK+="mixer" diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/oldstuff/45-usb.rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eudev/stuff/oldstuff/45-usb.rules Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,3 @@ +# usb devices +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE:="0666" +SUBSYSTEM=="usb_device",MODE:="0666" diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/oldstuff/90-permissions.rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eudev/stuff/oldstuff/90-permissions.rules Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,12 @@ + +# sound devices +SUBSYSTEM=="sound",GROUP="audio" +SUBSYSTEM=="sound",MODE="0664" + +# storage +SUBSYSTEM=="ide",GROUP="root" +SUBSYSTEM=="ide",MODE="0660" +SUBSYSTEM=="ata",GROUP="root" +SUBSYSTEM=="ata",MODE="0660" +SUBSYSTEM=="scsi",GROUP="root" +SUBSYSTEM=="scsi",MODE="0660" diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/oldstuff/92-hal.rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eudev/stuff/oldstuff/92-hal.rules Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,2 @@ +# pass all events to hal daemon +#RUN+="socket:@/org/freedesktop/hal/udev_event" diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/oldstuff/udev.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eudev/stuff/oldstuff/udev.conf Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,29 @@ +# /etc/udev/udev.conf - The main config file for udev +# +# This file can be used to override some of udev's default values +# for where it looks for files, and where it places device nodes. + + +# udev_root - where in the filesystem to place the device nodes +udev_root="/dev/" + +# udev_db - The name and location of the udev database. +#udev_db="/run/udev/tdb" + +# udev_rules - The name and location of the udev rules dir +udev_rules="/etc/udev/rules.d" + +# default_mode - set the default mode for all nodes that have no +# explicit match in the permissions file +default_mode="0660" + +# default_owner - set the default owner for all nodes that have no +# explicit match in the permissions file +default_owner="root" + +# default_group - set the default group for all nodes that have no +# explicit match in the permissions file +default_group="root" + +# udev_log - set to "yes" if you want logging, else "no" +udev_log="err" diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/udev.conf --- a/eudev/stuff/udev.conf Fri Sep 08 15:20:22 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# /etc/udev/udev.conf - The main config file for udev -# -# This file can be used to override some of udev's default values -# for where it looks for files, and where it places device nodes. - - -# udev_root - where in the filesystem to place the device nodes -udev_root="/dev/" - -# udev_db - The name and location of the udev database. -#udev_db="/run/udev/tdb" - -# udev_rules - The name and location of the udev rules dir -udev_rules="/etc/udev/rules.d" - -# default_mode - set the default mode for all nodes that have no -# explicit match in the permissions file -default_mode="0660" - -# default_owner - set the default owner for all nodes that have no -# explicit match in the permissions file -default_owner="root" - -# default_group - set the default group for all nodes that have no -# explicit match in the permissions file -default_group="root" - -# udev_log - set to "yes" if you want logging, else "no" -udev_log="err" diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/udev/init-net-rules.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eudev/stuff/udev/init-net-rules.sh Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,129 @@ +#! /bin/bash + +# This script generates rules for persistent network device naming +# Data from udev-182 75-persistent-net-generator.rules +# Updated fof udev-197 (DEVICES=en*) + +RULES=/etc/udev/rules.d/70-persistent-net.rules +DEVICES=$(eval echo /sys/class/net/{en*,eth*,ath*,wlan*[0-9],msh*,ra*,sta*,ctc*,lcs*,hsi*}) + +function usage +{ + echo $msg + echo "init-net-rules.sh is an LFS-specific script to initialize" + echo "$RULES" + exit 1 +} + +declare -A VENDORS_IGNORED +VENDORS_IGNORED['52:54:00:']="kvm" +VENDORS_IGNORED['00:0c:29:']="vmware" +VENDORS_IGNORED['00:50:56:']="vmware" +VENDORS_IGNORED['00:15:5d:']="hyper-v" +VENDORS_IGNORED['00:00:00:']="invalid" + +declare -A VENDORS +VENDORS['02:07:01:']="Interlan, DEC, etc" +VENDORS['02:60:60:']="3com" +VENDORS['02:60:8c:']="3Com IBM PC; Imagen. etc" +VENDORS['02:a0:c9:']="intel" +VENDORS['02:aa:3c:']="Olivetti" +VENDORS['02:cf:1f:']="Masscomp, Silicon Graphics, etc" +VENDORS['02:e0:3b:']="Gigabit" +VENDORS['02:e6:d3:']="BTI" +VENDORS['52:54:00:']="Realtek" +VENDORS['52:54:4c:']="Novell" +VENDORS['52:54:ab:']="Realtek" +VENDORS['e2:0c:0f:']="Kingston" +VENDORS['00:16:3e:']="Xensource" + +function ignore_if +{ + if [[ "${VENDORS_IGNORED[$VENDOR]}" != "" ]]; then return 0; fi + if [[ "${VENDORS[$VENDOR]}" != "" ]]; then return 1; fi + + byte2=$(echo $VENDOR | cut -c2) + if echo $byte2 | grep -q "[2367abef]"; then return 0; fi + + return 1 # Default is to not ignore +} + +function comment +{ + # Not implemented + # SUBSYSTEMS=="pci" + # export COMMENT="PCI device $attr{vendor}:$attr{device} ($driver)" + + # SUBSYSTEMS=="usb", ATTRS{idVendor}=="?*" + # export COMMENT="USB device 0x$attr{idVendor}:0x$attr{idProduct} ($driver)" + + # SUBSYSTEMS=="pcmcia", + # export COMMENT="PCMCIA device $attr{card_id}:$attr{manf_id} ($driver)" + + # SUBSYSTEMS=="ieee1394", + # export COMMENT="Firewire device $attr{host_id})" + + # ibmveth likes to use "locally administered" MAC addresses + # DRIVERS=="ibmveth", + # export COMMENT="ibmveth ($id)" + + # S/390 uses id matches only, do not use MAC address match + # SUBSYSTEMS=="ccwgroup", + # export COMMENT="S/390 $driver device at $id", + # export MATCHID="$id" + # export MATCHDRV="$driver" + # export MATCHADDR="" + + # Default + driver=$(basename $(readlink -f $NIC/device/driver/module)) + export COMMENT="net device ${driver}" +} + +if ! mountpoint -q /sys; then + msg="/sys mut be mounted" + usage +fi + +if ! mountpoint -q /proc; then + msg="/proc mut be mounted" + usage +fi + +if [ -e $RULES ]; then + msg="The rules file already exists" + usage +fi + +# Ignore Xen virtual interfaces +if [ -e /proc/xen ]; then + msg="The rules file should not be created in the Xen environment" + usage +fi + +# Variables used to communicate with write_net_rules: +# INTERFACE simple interface name +# MATCHADDR MAC address used for the match +# MATCHID bus_id used for the match +# MATCHDRV driver name used for the match +# MATCHIFTYPE interface type match +# COMMENT comment to add to the generated rule +# INTERFACE_NAME requested name supplied by external tool +# INTERFACE_NEW new interface name returned by rule writer + +for NIC in $DEVICES; do + IF=${NIC##*/} + if echo $NIC | grep -q '*' ; then continue; fi + + export INTERFACE=${NIC##*/} # Simple interface name + export MATCHADDR="$(cat $NIC/address)" # Read MAC address + + VENDOR=$(echo $MATCHADDR | cut -c-9) + if ignore_if; then continue; fi + + export MATCHDEVID="$(cat $NIC/dev_id)" + export MATCHIFTYPE="$(cat $NIC/type)" # Read interface type + comment + + /lib/udev/write_net_rules +done + diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/udev/rule_generator.functions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eudev/stuff/udev/rule_generator.functions Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,115 @@ +# functions used by the udev rule generator + +# Copyright (C) 2006 Marco d'Itri +# Updated for LFS by Bruce Dubbs +# Hardcoded RUNDIR + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +PATH='/usr/bin:/bin:/usr/sbin:/sbin' + +# Read a single line from file $1 in the $DEVPATH directory. +# The function must not return an error even if the file does not exist. +sysread() { + local file="$1" + [ -e "/sys$DEVPATH/$file" ] || return 0 + local value + read value < "/sys$DEVPATH/$file" || return 0 + echo "$value" +} + +sysreadlink() { + local file="$1" + [ -e "/sys$DEVPATH/$file" ] || return 0 + readlink -f /sys$DEVPATH/$file 2> /dev/null || true +} + +# Return true if a directory is writeable. +writeable() { + if ln -s test-link $1/.is-writeable 2> /dev/null; then + rm -f $1/.is-writeable + return 0 + else + return 1 + fi +} + +# Create a lock file for the current rules file. +lock_rules_file() { + RUNDIR=/run/udev + [ -e "$RUNDIR" ] || return 0 + + RULES_LOCK="$RUNDIR/.lock-${RULES_FILE##*/}" + + retry=30 + while ! mkdir $RULES_LOCK 2> /dev/null; do + if [ $retry -eq 0 ]; then + echo "Cannot lock $RULES_FILE!" >&2 + exit 2 + fi + sleep 1 + retry=$(($retry - 1)) + done +} + +unlock_rules_file() { + [ "$RULES_LOCK" ] || return 0 + rmdir $RULES_LOCK || true +} + +# Choose the real rules file if it is writeable or a temporary file if not. +# Both files should be checked later when looking for existing rules. +choose_rules_file() { + RUNDIR=/run/udev + local tmp_rules_file="$RUNDIR/tmp-rules--${RULES_FILE##*/}" + [ -e "$RULES_FILE" -o -e "$tmp_rules_file" ] || PRINT_HEADER=1 + + if writeable ${RULES_FILE%/*}; then + RO_RULES_FILE='/dev/null' + else + RO_RULES_FILE=$RULES_FILE + RULES_FILE=$tmp_rules_file + fi +} + +# Return the name of the first free device. +raw_find_next_available() { + local links="$1" + + local basename=${links%%[ 0-9]*} + local max=-1 + for name in $links; do + local num=${name#$basename} + [ "$num" ] || num=0 + [ $num -gt $max ] && max=$num + done + + local max=$(($max + 1)) + # "name0" actually is just "name" + [ $max -eq 0 ] && return + echo "$max" +} + +# Find all rules matching a key (with action) and a pattern. +find_all_rules() { + local key="$1" + local linkre="$2" + local match="$3" + + local search='.*[[:space:],]'"$key"'"('"$linkre"')".*' + echo $(sed -n -r -e 's/^#.*//' -e "${match}s/${search}/\1/p" \ + $RO_RULES_FILE \ + $([ -e $RULES_FILE ] && echo $RULES_FILE) \ + 2>/dev/null) +} diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/udev/write_cd_rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eudev/stuff/udev/write_cd_rules Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,126 @@ +#!/bin/sh -e + +# This script is run if an optical drive lacks a rule for persistent naming. +# +# It adds symlinks for optical drives based on the device class determined +# by cdrom_id and used ID_PATH to identify the device. + +# (C) 2006 Marco d'Itri +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# debug, if UDEV_LOG= +if [ -n "$UDEV_LOG" ]; then + if [ "$UDEV_LOG" -ge 7 ]; then + set -x + fi +fi + +RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules" + +. /lib/udev/rule_generator.functions + +find_next_available() { + raw_find_next_available "$(find_all_rules 'SYMLINK\+=' "$1")" +} + +write_rule() { + local match="$1" + local link="$2" + local comment="$3" + + { + if [ "$PRINT_HEADER" ]; then + PRINT_HEADER= + echo "# This file was automatically generated by the $0" + echo "# program, run by the cd-aliases-generator.rules rules file." + echo "#" + echo "# You can modify it, as long as you keep each rule on a single" + echo "# line, and set the \$GENERATED variable." + echo "" + fi + + [ "$comment" ] && echo "# $comment" + echo "$match, SYMLINK+=\"$link\", ENV{GENERATED}=\"1\"" + } >> $RULES_FILE + SYMLINKS="$SYMLINKS $link" +} + +if [ -z "$DEVPATH" ]; then + echo "Missing \$DEVPATH." >&2 + exit 1 +fi +if [ -z "$ID_CDROM" ]; then + echo "$DEVPATH is not a CD reader." >&2 + exit 1 +fi + +if [ "$1" ]; then + METHOD="$1" +else + METHOD='by-path' +fi + +case "$METHOD" in + by-path) + if [ -z "$ID_PATH" ]; then + echo "$DEVPATH not supported by path_id. by-id may work." >&2 + exit 1 + fi + RULE="ENV{ID_PATH}==\"$ID_PATH\"" + ;; + + by-id) + if [ "$ID_SERIAL" ]; then + RULE="ENV{ID_SERIAL}==\"$ID_SERIAL\"" + elif [ "$ID_MODEL" -a "$ID_REVISION" ]; then + RULE="ENV{ID_MODEL}==\"$ID_MODEL\", ENV{ID_REVISION}==\"$ID_REVISION\"" + else + echo "$DEVPATH not supported by ata_id. by-path may work." >&2 + exit 1 + fi + ;; + + *) + echo "Invalid argument (must be either by-path or by-id)." >&2 + exit 1 + ;; +esac + +# Prevent concurrent processes from modifying the file at the same time. +lock_rules_file + +# Check if the rules file is writeable. +choose_rules_file + +link_num=$(find_next_available 'cdrom[0-9]*') + +match="SUBSYSTEM==\"block\", ENV{ID_CDROM}==\"?*\", $RULE" + +comment="$ID_MODEL ($ID_PATH)" + + write_rule "$match" "cdrom$link_num" "$comment" +[ "$ID_CDROM_CD_R" -o "$ID_CDROM_CD_RW" ] && \ + write_rule "$match" "cdrw$link_num" +[ "$ID_CDROM_DVD" ] && \ + write_rule "$match" "dvd$link_num" +[ "$ID_CDROM_DVD_R" -o "$ID_CDROM_DVD_RW" -o "$ID_CDROM_DVD_RAM" ] && \ + write_rule "$match" "dvdrw$link_num" +echo >> $RULES_FILE + +unlock_rules_file + +echo $SYMLINKS + +exit 0 diff -r 9bfc85b0324c -r e44a1a92452b eudev/stuff/udev/write_net_rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eudev/stuff/udev/write_net_rules Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,140 @@ +#!/bin/sh -e + +# This script is run to create persistent network device naming rules +# based on properties of the device. +# If the interface needs to be renamed, INTERFACE_NEW= will be printed +# on stdout to allow udev to IMPORT it. + +# variables used to communicate: +# MATCHADDR MAC address used for the match +# MATCHID bus_id used for the match +# MATCHDEVID dev_id used for the match +# MATCHDRV driver name used for the match +# MATCHIFTYPE interface type match +# COMMENT comment to add to the generated rule +# INTERFACE_NAME requested name supplied by external tool +# INTERFACE_NEW new interface name returned by rule writer + +# Copyright (C) 2006 Marco d'Itri +# Copyright (C) 2007 Kay Sievers +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# debug, if UDEV_LOG= +if [ -n "$UDEV_LOG" ]; then + if [ "$UDEV_LOG" -ge 7 ]; then + set -x + fi +fi + +RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' + +. /lib/udev/rule_generator.functions + +interface_name_taken() { + local value="$(find_all_rules 'NAME=' $INTERFACE)" + if [ "$value" ]; then + return 0 + else + return 1 + fi +} + +find_next_available() { + raw_find_next_available "$(find_all_rules 'NAME=' "$1")" +} + +write_rule() { + local match="$1" + local name="$2" + local comment="$3" + + { + if [ "$PRINT_HEADER" ]; then + PRINT_HEADER= + echo "# This file was automatically generated by the $0" + echo "# program, run by the persistent-net-generator.rules rules file." + echo "#" + echo "# You can modify it, as long as you keep each rule on a single" + echo "# line, and change only the value of the NAME= key." + fi + + echo "" + [ "$comment" ] && echo "# $comment" + echo "SUBSYSTEM==\"net\", ACTION==\"add\"$match, NAME=\"$name\"" + } >> $RULES_FILE +} + +if [ -z "$INTERFACE" ]; then + echo "missing \$INTERFACE" >&2 + exit 1 +fi + +# Prevent concurrent processes from modifying the file at the same time. +lock_rules_file + +# Check if the rules file is writeable. +choose_rules_file + +# the DRIVERS key is needed to not match bridges and VLAN sub-interfaces +if [ "$MATCHADDR" ]; then + match="$match, DRIVERS==\"?*\", ATTR{address}==\"$MATCHADDR\"" +fi + +if [ "$MATCHDRV" ]; then + match="$match, DRIVERS==\"$MATCHDRV\"" +fi + +if [ "$MATCHDEVID" ]; then + match="$match, ATTR{dev_id}==\"$MATCHDEVID\"" +fi + +if [ "$MATCHID" ]; then + match="$match, KERNELS==\"$MATCHID\"" +fi + +if [ "$MATCHIFTYPE" ]; then + match="$match, ATTR{type}==\"$MATCHIFTYPE\"" +fi + +if [ -z "$match" ]; then + echo "missing valid match" >&2 + unlock_rules_file + exit 1 +fi + +basename=${INTERFACE%%[0-9]*} + +if [ "$INTERFACE_NAME" ]; then + # external tools may request a custom name + COMMENT="$COMMENT (custom name provided by external tool)" + if [ "$INTERFACE_NAME" != "$INTERFACE" ]; then + INTERFACE=$INTERFACE_NAME; + echo "INTERFACE_NEW=$INTERFACE" + fi +else + # if a rule using the current name already exists, find a new name + if interface_name_taken; then + INTERFACE="$basename$(find_next_available "$basename[0-9]*")" + # prevent INTERFACE from being "eth" instead of "eth0" + [ "$INTERFACE" = "${INTERFACE%%[ \[\]0-9]*}" ] && INTERFACE=${INTERFACE}0 + echo "INTERFACE_NEW=$INTERFACE" + fi +fi + +write_rule "$match" "$INTERFACE" "$COMMENT" + +unlock_rules_file + +exit 0 diff -r 9bfc85b0324c -r e44a1a92452b make-slitaz-icons/receipt --- a/make-slitaz-icons/receipt Fri Sep 08 15:20:22 2017 +0300 +++ b/make-slitaz-icons/receipt Tue Sep 12 01:34:11 2017 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="make-slitaz-icons" -VERSION="170814" +VERSION="170911" CATEGORY="development" SHORT_DESC="Make SliTaz icon theme" MAINTAINER="al.bobylev@gmail.com" diff -r 9bfc85b0324c -r e44a1a92452b make-slitaz-icons/stuff/mksit.sh --- a/make-slitaz-icons/stuff/mksit.sh Fri Sep 08 15:20:22 2017 +0300 +++ b/make-slitaz-icons/stuff/mksit.sh Tue Sep 12 01:34:11 2017 +0300 @@ -3,7 +3,7 @@ # Aleksej Bobylev , 2014-2017 # (Started in November 2014) -VERSION="170814" +VERSION="170911" . /lib/libtaz.sh @@ -63,7 +63,7 @@ for SIZE in $SIZES; do FOUND='' for ICON in $(echo "$@" | sed 's|\([^ ]*\)|& gnome-mime-& gnome-dev-&|'); do - FINDICON=$(findi $ICON | sed "s|$FROM||g" | grep -e "/$SIZE/" -e "/${SIZE}x$SIZE/") + FINDICON=$(findi $ICON | sed "s|$FROM||g" | grep -e "/$SIZE/" -e "/${SIZE}x$SIZE/" -e "/scalable/") if [ -n "$FINDICON" ]; then if [ $(echo "$FINDICON" | wc -l) != "1" ]; then @@ -299,7 +299,7 @@ c mail-mark-unread c mail-message-new c mail-reply-all -c mail-reply-sender +c mail-reply-sender mail-reply c mail-send c mail-send-receive c media-eject list-remove # Matrilineare hack @@ -317,7 +317,7 @@ c object-rotate-right s process-stop # gtk_stock 16,24 c system-lock-screen lock # Matrilineare hack -c system-log-out contact-new # Matrilineare hack +#c system-log-out contact-new # Matrilineare hack c system-run # gtk_stock 16,24; Transmission (GTK+3) needs it c system-search find # Matrilineare hack c system-reboot system-run # Matrilineare hack @@ -329,7 +329,7 @@ s view-sort-ascending # gtk_stock 16,24 s view-sort-descending # gtk_stock 16,24 c window-close # gtk_stock 16,20,24; Transmission (GTK+3) needs it -c window-new +c window-new list-add s zoom-fit-best # gtk_stock 16,24 s zoom-in # gtk_stock 16,24 s zoom-original # gtk_stock 16,24 @@ -347,13 +347,22 @@ c gtk-go-forward gtk-go-forward-ltr # tazbox tz Yad dialog c bookmark-new # Midori c empty # Yad:tazbox new-file -c extract-archive # tazpkg-box, xarchiver... +c extract-archive document-export # tazpkg-box, xarchiver... c package-install # tazpkg-box +c system-log-out-panel system-log-out-symbolic # lxpanel logout menu +c system-reboot-panel system-restart-symbolic # +c system-shutdown-panel system-shutdown-symbolic # + + SIZES='16 48' c document-new # Yad:tazbox new-file c document-properties # Yad:tazbox locale, tazbox manage-i18n +c system-log-out # lxpanel logout menu +c system-reboot # +c system-shutdown # + ############################ # Standard Animation Icons # @@ -388,26 +397,27 @@ c system-software-update # update-notifier c utilities-system-monitor c utilities-terminal +c utilities-root-terminal utilities-terminal #------------------- c gcolor2 # gcolor2.desktop c gnome-glchess # chess.desktop c gpicview # gpicview.desktop -c tazcalc gnumeric # tazcalc.desktop -c alsaplayer gnome-audio # alsaplayer.desktop -c leafpad # leafpad.desktop +c tazcalc gnumeric x-office-spreadsheet # tazcalc.desktop +c alsaplayer gnome-audio gnome-mplayer # alsaplayer.desktop +c leafpad accessories-text-editor # leafpad.desktop c midori # midori.desktop c mtpaint # mtpaint.desktop c xterm # xterm.desktop -c burn-box brasero # burn-box.desktop -c iso-image-burn # burn-iso.desktop -c system-log-out # lxde-logout.desktop +c burn-box brasero disk-burner # burn-box.desktop +c iso-image-burn disk-burner # burn-iso.desktop +#c system-log-out # lxde-logout.desktop c sudoku gnome-sudoku # sudoku.desktop c utilities-log-viewer # bootlog.desktop c preferences-desktop-display # lxrandr.desktop c tazbug bug-buddy # tazbug.desktop c applets-screenshooter # mtpaint-grab.desktop -c tazwikiss zim # tazwikiss.desktop -c system-software-installer # tazpanel-pkgs.desktop +c tazwikiss zim accessories-notes # tazwikiss.desktop +c system-software-installer software-center software-store # tazpanel-pkgs.desktop c session-properties # lxsession-edit.desktop c terminal # sakura.desktop c user_auth # passwd.desktop @@ -418,7 +428,7 @@ c network-wireless # wifi-box.desktop c gparted # gparted.desktop c epdfview acroread # epdfview.desktop -c menu-editor # libfm-pref-apps.desktop +#c menu-editor # libfm-pref-apps.desktop c preferences-system-windows # obconf.desktop c twitter # twitter.desktop c network-server # httpd.desktop @@ -613,7 +623,7 @@ # packages c $A-vnd.android.package-archive c $A-x-deb -c $A-x-java-archive +c $A-x-java-archive java c $A-x-rpm c $A-x-source-rpm $A-x-rpm c $A-x-tazpkg package-x-generic @@ -677,7 +687,7 @@ c text-x-install c text-x-log text-x-changelog c text-x-makefile -c text-x-markdown text-x-source +c text-x-markdown text-markdown text-x-source c text-x-patch c text-x-python c text-x-readme @@ -719,14 +729,10 @@ ######################### # Standard Status Icons # ######################### -CATEGORY='status'; SIZES='22'; echo_cat +CATEGORY='status'; SIZES='16'; echo_cat c appointment-missed c appointment-soon -c audio-volume-high # gtk_stock 24 -c audio-volume-low # gtk_stock 24 -c audio-volume-medium # gtk_stock 24 -c audio-volume-muted # gtk_stock 24 c battery-caution notification-battery-empty c battery-low notification-battery-low c dialog-error # gtk_stock 48 @@ -758,8 +764,6 @@ c security-high c security-medium c security-low -c software-update-available -c software-update-urgent c sync-error c sync-synchronizing c task-due @@ -792,6 +796,12 @@ c dialog-question c dialog-warning c appointment-soon # Yad:tazbox manage-i18n +c audio-volume-high # gtk_stock 24 +c audio-volume-low # gtk_stock 24 +c audio-volume-medium # gtk_stock 24 +c audio-volume-muted # gtk_stock 24 +c software-update-available +c software-update-urgent # LXPanel status icons SIZES="22" diff -r 9bfc85b0324c -r e44a1a92452b ntfs-3g/receipt --- a/ntfs-3g/receipt Fri Sep 08 15:20:22 2017 +0300 +++ b/ntfs-3g/receipt Tue Sep 12 01:34:11 2017 +0300 @@ -53,6 +53,7 @@ copy @std remove_already_packed CONFIG_FILES="/etc/filesystems" + DEPENDS=" " ;; *-dev) copy @dev diff -r 9bfc85b0324c -r e44a1a92452b pcmanfm/receipt --- a/pcmanfm/receipt Fri Sep 08 15:20:22 2017 +0300 +++ b/pcmanfm/receipt Tue Sep 12 01:34:11 2017 +0300 @@ -40,6 +40,9 @@ mkdir -p $install/usr/share/file-manager && cp -r $stuff/actions/ $install/usr/share/file-manager && install -m755 $stuff/gvfs-mount-archive.sh $install/usr/bin + + # avoid warning about missed modules dir + mkdir -p $install/usr/lib/pcmanfm } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 9bfc85b0324c -r e44a1a92452b polkit/receipt --- a/polkit/receipt Fri Sep 08 15:20:22 2017 +0300 +++ b/polkit/receipt Tue Sep 12 01:34:11 2017 +0300 @@ -33,6 +33,8 @@ # for access file in web interface, will be changed back in post-install to 700 chmod 755 "$install/etc/polkit-1/rules.d/" + + cp $stuff/*.rules $install/etc/polkit-1/rules.d/ } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 9bfc85b0324c -r e44a1a92452b polkit/stuff/10-udisks2.rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/polkit/stuff/10-udisks2.rules Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,13 @@ +// See the polkit(8) man page for more information +// about configuring polkit. + +// Allow udisks2 to mount devices without authentication +// for users in the "disk" group. + +polkit.addRule(function(action, subject) { + if ((action.id == "org.freedesktop.udisks2.filesystem-mount-system" || + action.id == "org.freedesktop.udisks2.filesystem-mount") && + subject.isInGroup("disk")) { + return polkit.Result.YES; + } +}); diff -r 9bfc85b0324c -r e44a1a92452b slitaz-base-files/receipt --- a/slitaz-base-files/receipt Fri Sep 08 15:20:22 2017 +0300 +++ b/slitaz-base-files/receipt Tue Sep 12 01:34:11 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="slitaz-base-files" -VERSION="330" +VERSION="331" CATEGORY="base-system" -SHORT_DESC="Linux tree and the necessary files for the base system." +SHORT_DESC="Linux tree and the necessary files for the base system" MAINTAINER="pankso@slitaz.org" LICENSE="BSD GPL3" WEB_SITE="http://www.slitaz.org/" @@ -12,100 +12,59 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="http://hg.slitaz.org/$PACKAGE/archive/$VERSION.tar.bz2" -DEPENDS="gettext-base" BUILD_DEPENDS="gettext" -CONFIG_FILES=" -/etc/adduser.conf -/etc/passwd -/etc/fstab -/etc/issue -/etc/hosts -/etc/host.conf -/etc/hostname -/etc/group -/etc/gshadow -/etc/shadow -/etc/daemons.conf -/etc/nsswitch.conf -/etc/networks -/etc/profile -/etc/securetty -/etc/services -/etc/shells" - # Rules to configure and make the package. compile_rules() { - make DESTDIR=$DESTDIR install + make DESTDIR=$install install + + for i in /bin /dev /home /media/cdrom /media/flash /media/usbdisk /mnt \ + /proc /root /run /sbin /sys /tmp /usr/bin /usr/games /usr/lib /usr/sbin \ + /usr/share/doc /var/cache /var/games /var/lib /var/lock /var/log/slitaz \ + /var/spool /var/tmp /var/run + do + mkdir -p $install$i + done + + # Create /etc/mtab symlink + ln -s /proc/mounts $install/etc/mtab + + # Add httphelper link + ln -s httphelper.sh $install/usr/lib/slitaz/httphelper + + # Populate /dev with $fs/sbin/mktazdevs.sh. + # Not required with udev. + # $fs/sbin/mktazdevs.sh $fs/dev + + # Update copyright year + grep -rl 'copy; 2' $fs/var/www | xargs \ + sed -i "s/copy; [0-9]*/copy; $(date +%Y)/" + + # Set release + echo 'next' > $fs/etc/slitaz-release + + chown -R root:root $install + chmod 1777 $install/tmp + chmod 640 $install/etc/shadow + chmod 640 $install/etc/gshadow + chmod 0750 $install/root } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p \ - $fs/bin \ - $fs/dev \ - $fs/home \ - $fs/media/cdrom \ - $fs/media/flash \ - $fs/media/usbdisk \ - $fs/mnt \ - $fs/proc \ - $fs/root \ - $fs/run \ - $fs/sbin \ - $fs/sys \ - $fs/tmp \ - $fs/usr/bin \ - $fs/usr/games \ - $fs/usr/lib \ - $fs/usr/sbin \ - $fs/usr/share/doc \ - $fs/var/cache \ - $fs/var/games \ - $fs/var/lib \ - $fs/var/lock \ - $fs/var/log/slitaz \ - $fs/var/spool \ - $fs/var/tmp \ - $fs/var/run - - # Daemons may store the pid files in /var/run - # from 5.0 /var/run is mounted as tmpfs - #ln -s /run $fs/var/run - - # Copy all installed files and set permissions. cp -a $install/* $fs - - chown -R root.root $fs/* - chmod 1777 $fs/tmp - chmod 640 $fs/etc/shadow - chmod 640 $fs/etc/gshadow - chmod 0750 $fs/root - - # Populate /dev with $fs/sbin/mktazdevs.sh. - $fs/sbin/mktazdevs.sh $fs/dev - - # Create /etc/mtab symlink. - cd $fs/etc - ln -s /proc/mounts mtab - - # Fix httphelper link - cd $fs/usr/lib/slitaz - ln -s httphelper.sh httphelper - - # Update copyright year - grep -rl 'copy; 2' $fs/var/www | xargs \ - sed -i "s/copy; [0-9]*/copy; $(date +%Y)/" - - echo 'next' > $fs/etc/slitaz-release + DEPENDS="gettext-base" + CONFIG_FILES="/etc/adduser.conf /etc/passwd /etc/fstab /etc/issue \ + /etc/hosts /etc/host.conf /etc/hostname /etc/group /etc/gshadow \ + /etc/shadow /etc/daemons.conf /etc/nsswitch.conf /etc/networks \ + /etc/profile /etc/securetty /etc/services /etc/shells" } -# Pre and post install to backup all /etc/settings +# Pre and post install to backup all /etc settings # -pre_install() -{ +pre_install() { cp -a "$1/etc" "$1/tmp/etc.bak" 2>/dev/null [ -x "$1/usr/bin/sudo" ] && mv "$1/usr/bin/sudo" "$1/usr/bin/sudo.orig" # Remove old /var/run symlink @@ -113,13 +72,13 @@ : } -post_install() -{ +post_install() { if cp -a "$1/tmp/etc.bak"/* "$1/etc"; then rm -r "$1/tmp/etc.bak" fi 2>/dev/null - [ -x "$1/usr/bin/sudo.orig" ] && mv -f "$1/usr/bin/sudo.orig" "$1/usr/bin/sudo" + [ -x "$1/usr/bin/sudo.orig" ] && + mv -f "$1/usr/bin/sudo.orig" "$1/usr/bin/sudo" # Reset permission. chmod 640 "$1/etc/shadow" @@ -130,8 +89,7 @@ fi } -pre_remove() -{ - # We can not remove this package! +# We can not remove this package! +pre_remove() { exit 1 } diff -r 9bfc85b0324c -r e44a1a92452b slitaz-boot-scripts/receipt --- a/slitaz-boot-scripts/receipt Fri Sep 08 15:20:22 2017 +0300 +++ b/slitaz-boot-scripts/receipt Tue Sep 12 01:34:11 2017 +0300 @@ -1,9 +1,9 @@ # SliTaz package receipt. PACKAGE="slitaz-boot-scripts" -VERSION="440" +VERSION="442" CATEGORY="base-system" -SHORT_DESC="Provide all the initialisation scripts used at boot time." +SHORT_DESC="Provide all the initialisation scripts used at boot time" MAINTAINER="pankso@slitaz.org" LICENSE="GPL3" WEB_SITE="http://www.slitaz.org/" diff -r 9bfc85b0324c -r e44a1a92452b slitaz-icons-paper/receipt --- a/slitaz-icons-paper/receipt Fri Sep 08 15:20:22 2017 +0300 +++ b/slitaz-icons-paper/receipt Tue Sep 12 01:34:11 2017 +0300 @@ -12,9 +12,13 @@ # Rules to compile and make the package. compile_rules() { + to="$install/usr/share/icons/SliTaz-Paper" + mkdir -p $to + cp -r $stuff/22x22 $to + mksit.sh \ -f /usr/share/icons/Paper \ - -t $install/usr/share/icons/SliTaz-Paper \ + -t $to \ -opmax } diff -r 9bfc85b0324c -r e44a1a92452b slitaz-icons-paper/stuff/22x22/status/avatar-default.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/slitaz-icons-paper/stuff/22x22/status/avatar-default.svg Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,1 @@ + \ No newline at end of file diff -r 9bfc85b0324c -r e44a1a92452b slitaz-icons-paper/stuff/22x22/status/start-here.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/slitaz-icons-paper/stuff/22x22/status/start-here.svg Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,1 @@ + \ No newline at end of file diff -r 9bfc85b0324c -r e44a1a92452b slitaz-next/stuff/etc/skel/.config/lxpanel/slitaz/panels/panel --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/slitaz-next/stuff/etc/skel/.config/lxpanel/slitaz/panels/panel Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,218 @@ +# lxpanel config file. Manually editing is not recommended. +# Use preference dialog in lxpanel to adjust config when you can. + +Global { + edge=top + allign=center + margin=0 + widthtype=percent + width=100 + height=22 + transparent=0 + tintcolor=#222222 + alpha=255 + autohide=0 + heightwhenhidden=2 + setdocktype=1 + setpartialstrut=1 + usefontcolor=0 + fontsize=10 + fontcolor=#cfcfcf + usefontsize=0 + background=0 + backgroundfile= + iconsize=22 + loglevel=2 +} + +Plugin { + type = menu + Config { + name=SliTazMenu.directory + image=start-here + tintcolor=#33230D + system { + } + separator { + } + item { + command=run + image=gtk-execute + } + separator { + } + item { + image=system-shutdown-panel-restart + command=logout + } + } +} + +Plugin { + type = space + Config { + Size=2 + } +} + +Plugin { + type = pager +} + +Plugin { + type = space + Config { + Size=2 + } +} + +Plugin { + type = taskbar + expand=1 + Config { + tooltips=1 + IconsOnly=0 + ShowAllDesks=0 + UseMouseWheel=1 + UseUrgencyHint=1 + FlatButton=0 + MaxTaskWidth=160 + spacing=0 + GroupedTasks=0 + } +} + +Plugin { + type = space + Config { + Size=2 + } +} + +Plugin { + type = xkb + Config { + DisplayType=1 + PerWinLayout=0 + NoResetOpt=0 + KeepSysLayouts=1 + Model=pc105 + LayoutsList=us + VariantsList=, + ToggleOpt=shift_caps_toggle + FlagSize=4 + } +} + +Plugin { + type = tray +} + +Plugin { + type = space + Config { + Size=4 + } +} + +Plugin { + type = volumealsa +} + +Plugin { + type = space + Config { + Size=6 + } +} + +Plugin { + type = netstatus + Config { + iface=eth0 + configtool=subox tazpanel network + } +} + +Plugin { + type = space + Config { + Size=6 + } +} + +Plugin { + type = batt + Config { + HideIfNoBattery=0 + AlarmTime=5 + BackgroundColor=#404040 + BorderWidth=3 + ChargingColor1=#00A100 + ChargingColor2=#00A100 + DischargingColor1=#DB2C23 + DischargingColor2=#DB2C23 + Size=11 + } +} + +Plugin { + type = space + Config { + Size=6 + } +} + +Plugin { + type = cpu +} + +Plugin { + type = space + Config { + Size=4 + } +} + +Plugin { + type = dclock + Config { + ClockFmt=%R + TooltipFmt=%c + BoldFont=1 + IconOnly=0 + CenterText=1 + } +} + +Plugin { + type = menu + Config { + name=user.directory + image=avatar-default + tintcolor=#33230D + item { + image=system-log-out-panel + name=Close X session + action=tazbox logout exit + } + item { + image=system-reboot-panel + name=Reboot system + action=tazbox logout reboot + } + item { + image=system-shutdown-panel + name=Shutdown system + action=tazbox logout halt + } + } +} + +Plugin { + type = space + Config { + Size=4 + } +} + diff -r 9bfc85b0324c -r e44a1a92452b slitaz-next/stuff/etc/skel/.config/pcmanfm/LXDE/desktop-items-0.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/slitaz-next/stuff/etc/skel/.config/pcmanfm/LXDE/desktop-items-0.conf Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,13 @@ +[*] +wallpaper_mode=crop +wallpaper_common=1 +desktop_bg=#000000 +desktop_fg=#ffffff +desktop_shadow=#000000 +desktop_font=Sans 10 +show_wm_menu=1 +sort=mtime;ascending;mingle; +show_documents=1 +show_trash=1 +show_mounts=1 + diff -r 9bfc85b0324c -r e44a1a92452b slitaz-next/stuff/etc/skel/.config/pcmanfm/LXDE/pcmanfm.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/slitaz-next/stuff/etc/skel/.config/pcmanfm/LXDE/pcmanfm.conf Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,26 @@ +[config] +bm_open_method=0 + +[volume] +mount_on_startup=1 +mount_removable=1 +autorun=1 + +[ui] +always_show_tabs=0 +max_tab_chars=32 +win_width=640 +win_height=480 +splitter_pos=150 +media_in_new_tab=0 +desktop_folder_new_win=0 +change_tab_on_drop=1 +close_on_unmount=0 +focus_previous=0 +side_pane_mode=places +view_mode=icon +show_hidden=0 +sort=name;ascending; +toolbar=newtab;navigation;home; +show_statusbar=1 +pathbar_mode_buttons=1 diff -r 9bfc85b0324c -r e44a1a92452b slitaz-next/stuff/etc/skel/.config/pcmanfm/default/desktop-items-0.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/slitaz-next/stuff/etc/skel/.config/pcmanfm/default/desktop-items-0.conf Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,14 @@ +[*] +wallpaper_mode=crop +wallpaper_common=1 +wallpaper=/usr/share/images/slitaz-background.jpg +desktop_bg=#000000 +desktop_fg=#ffffff +desktop_shadow=#000000 +desktop_font=Sans 10 +show_wm_menu=1 +sort=mtime;ascending; +show_documents=1 +show_trash=1 +show_mounts=1 + diff -r 9bfc85b0324c -r e44a1a92452b slitaz-next/stuff/etc/skel/.config/pcmanfm/main.lxde --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/slitaz-next/stuff/etc/skel/.config/pcmanfm/main.lxde Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,15 @@ +[General] +big_icon_size=48 +terminal=sakura + +[Window] +width=640 +height=480 +splitter_pos=160 +maximized=0 + +[Desktop] +show_desktop=1 +show_wallpaper=1 +wallpaper=/usr/share/images/slitaz-background.jpg +show_wm_menu=1 diff -r 9bfc85b0324c -r e44a1a92452b slitaz-next/stuff/etc/xdg/pcmanfm/default/pcmanfm.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/slitaz-next/stuff/etc/xdg/pcmanfm/default/pcmanfm.conf Tue Sep 12 01:34:11 2017 +0300 @@ -0,0 +1,34 @@ +[config] +bm_open_method=0 +su_cmd=subox %s + +[volume] +mount_on_startup=0 +mount_removable=1 +autorun=1 + +[desktop] +wallpaper_mode=crop +wallpaper=/usr/share/images/slitaz-background.jpg +desktop_bg=#000000 +desktop_fg=#ffffff +desktop_shadow=#000000 +desktop_font=Sans 9 +show_wm_menu=1 +show_documents=1 +show_trash=1 +show_mounts=1 + +[ui] +close_on_unmount=0 +focus_previous=1 +always_show_tabs=0 +max_tab_chars=32 +win_width=640 +win_height=480 +splitter_pos=150 +side_pane_mode=1 +view_mode=0 +show_hidden=0 +sort_type=0 +sort_by=2 diff -r 9bfc85b0324c -r e44a1a92452b slitaz-next/stuff/usr/share/icons/SliTaz-Paper/48x48/actions/system-log-out.png Binary file slitaz-next/stuff/usr/share/icons/SliTaz-Paper/48x48/actions/system-log-out.png has changed diff -r 9bfc85b0324c -r e44a1a92452b slitaz-next/stuff/usr/share/icons/SliTaz-Paper/48x48/actions/system-reboot.png Binary file slitaz-next/stuff/usr/share/icons/SliTaz-Paper/48x48/actions/system-reboot.png has changed diff -r 9bfc85b0324c -r e44a1a92452b slitaz-next/stuff/usr/share/icons/SliTaz-Paper/48x48/actions/system-shutdown.png Binary file slitaz-next/stuff/usr/share/icons/SliTaz-Paper/48x48/actions/system-shutdown.png has changed